X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_radius.cpp;h=3aef0db72eb27c09d8188ed6abc6227ffff613f4;hb=15c93f06ee6ddefa7e7b095351f6e66698c7cc9e;hp=f0afda868c637195fb7ca38a3b209274129fb0cf;hpb=37ff427189e242a4439bd30680e51ac20ab77ab9;p=mech_eap.orig

diff --git a/util_radius.cpp b/util_radius.cpp
index f0afda8..3aef0db 100644
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -44,71 +44,21 @@ static gss_buffer_desc radiusUrnPrefix = {
     (void *)"urn:x-radius:"
 };
 
-static struct rs_error *
-radiusAllocHandle(const char *configFile,
-                  rs_handle **pHandle)
-{
-    rs_handle *rh;
-    struct rs_alloc_scheme ralloc;
-
-    *pHandle = NULL;
-
-    if (configFile == NULL || configFile[0] == '\0')
-        configFile = RS_CONFIG_FILE;
-
-    if (rs_context_create(&rh, RS_DICT_FILE) != 0)
-        return NULL;
-
-    ralloc.calloc = gssEapCalloc;
-    ralloc.malloc = gssEapMalloc;
-    ralloc.free = gssEapFree;
-    ralloc.realloc = gssEapRealloc;
-
-    rs_context_set_alloc_scheme(rh, &ralloc);
-
-    if (rs_context_read_config(rh, configFile) != 0) {
-        rs_context_destroy(rh);
-        return rs_err_ctx_pop(rh);
-    }
-
-    *pHandle = rh;
-    return NULL;
-}
+static VALUE_PAIR *copyAvps(const VALUE_PAIR *src);
 
 gss_eap_radius_attr_provider::gss_eap_radius_attr_provider(void)
 {
-    m_rh = NULL;
     m_vps = NULL;
     m_authenticated = false;
 }
 
 gss_eap_radius_attr_provider::~gss_eap_radius_attr_provider(void)
 {
-    if (m_rh != NULL)
-        rs_context_destroy(m_rh);
     if (m_vps != NULL)
         pairfree(&m_vps);
 }
 
 bool
-gss_eap_radius_attr_provider::allocRadHandle(const std::string &configFile)
-{
-    m_configFile.assign(configFile);
-
-    /*
-     * Currently none of the FreeRADIUS functions we use here actually take
-     * a handle, so we may as well leave it as NULL.
-     */
-#if 0
-    radiusAllocHandle(m_configFile.c_str(), &m_rh);
-
-    return (m_rh != NULL);
-#else
-    return true;
-#endif
-}
-
-bool
 gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager,
                                                       const gss_eap_attr_provider *ctx)
 {
@@ -119,11 +69,10 @@ gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *ma
 
     radius = static_cast<const gss_eap_radius_attr_provider *>(ctx);
 
-    if (!allocRadHandle(radius->m_configFile))
-        return false;
-
     if (radius->m_vps != NULL)
-        m_vps = paircopy(const_cast<VALUE_PAIR *>(radius->getAvps()));
+        m_vps = copyAvps(const_cast<VALUE_PAIR *>(radius->getAvps()));
+
+    m_authenticated = radius->m_authenticated;
 
     return true;
 }
@@ -133,22 +82,18 @@ gss_eap_radius_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager
                                                  const gss_cred_id_t gssCred,
                                                  const gss_ctx_id_t gssCtx)
 {
-    std::string configFile(RS_CONFIG_FILE);
-
     if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
         return false;
 
-    if (gssCred != GSS_C_NO_CREDENTIAL && gssCred->radiusConfigFile != NULL)
-        configFile.assign(gssCred->radiusConfigFile);
-
-    if (!allocRadHandle(configFile))
-        return false;
-
     if (gssCtx != GSS_C_NO_CONTEXT) {
         if (gssCtx->acceptorCtx.vps != NULL) {
-            m_vps = paircopy(gssCtx->acceptorCtx.vps);
+            m_vps = copyAvps(gssCtx->acceptorCtx.vps);
             if (m_vps == NULL)
                 return false;
+
+            /* We assume libradsec validated this for us */
+            assert(pairfind(m_vps, PW_MESSAGE_AUTHENTICATOR) != NULL);
+            m_authenticated = true;
         }
     }
 
@@ -169,7 +114,7 @@ alreadyAddedAttributeP(std::vector <std::string> &attrs, VALUE_PAIR *vp)
 }
 
 static bool
-isHiddenAttributeP(uint16_t attrid, uint16_t vendor)
+isSecretAttributeP(uint16_t attrid, uint16_t vendor)
 {
     bool ret = false;
 
@@ -183,6 +128,28 @@ isHiddenAttributeP(uint16_t attrid, uint16_t vendor)
         default:
             break;
         }
+    default:
+        break;
+    }
+
+    return ret;
+}
+
+static bool
+isSecretAttributeP(uint32_t attribute)
+{
+    return isSecretAttributeP(ATTRID(attribute), VENDOR(attribute));
+}
+
+static bool
+isHiddenAttributeP(uint16_t attrid, uint16_t vendor)
+{
+    bool ret = false;
+
+    /* should have been filtered */
+    assert(!isSecretAttributeP(attrid, vendor));
+
+    switch (vendor) {
     case VENDORPEC_UKERNA:
         ret = true;
         break;
@@ -193,6 +160,41 @@ isHiddenAttributeP(uint16_t attrid, uint16_t vendor)
     return ret;
 }
 
+static bool
+isHiddenAttributeP(uint32_t attribute)
+{
+    return isHiddenAttributeP(ATTRID(attribute), VENDOR(attribute));
+}
+
+/*
+ * Copy AVP list, same as paircopy except it filters out attributes
+ * containing keys.
+ */
+static VALUE_PAIR *
+copyAvps(const VALUE_PAIR *src)
+{
+    const VALUE_PAIR *vp;
+    VALUE_PAIR *dst = NULL, **pDst = &dst;
+
+    for (vp = src; vp != NULL; vp = vp->next) {
+        VALUE_PAIR *vpcopy;
+
+        if (isSecretAttributeP(vp->attribute))
+            continue;
+
+        vpcopy = paircopyvp(vp);
+        if (vpcopy == NULL) {
+            pairfree(&dst);
+            throw new std::bad_alloc;
+            return NULL;
+        }
+        *pDst = vpcopy;
+        pDst = &vpcopy->next;
+     }
+
+    return dst;
+}
+
 bool
 gss_eap_radius_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAttribute, void *data) const
 {
@@ -202,7 +204,8 @@ gss_eap_radius_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addA
     for (vp = m_vps; vp != NULL; vp = vp->next) {
         gss_buffer_desc attribute;
         char attrid[64];
-        if (isHiddenAttributeP(ATTRID(vp->attribute), VENDOR(vp->attribute)))
+
+        if (isHiddenAttributeP(vp->attribute))
             continue;
 
         if (alreadyAddedAttributeP(seen, vp))
@@ -276,21 +279,19 @@ gss_eap_radius_attr_provider::getAttribute(const gss_buffer_t attr,
 }
 
 bool
-gss_eap_radius_attr_provider::getAttribute(uint16_t vattrid,
-                                           uint16_t vendor,
+gss_eap_radius_attr_provider::getAttribute(uint32_t attrid,
                                            int *authenticated,
                                            int *complete,
                                            gss_buffer_t value,
                                            gss_buffer_t display_value,
                                            int *more) const
 {
-    uint32_t attrid = VENDORATTR(vendor, vattrid);
     VALUE_PAIR *vp;
     int i = *more, count = 0;
 
     *more = 0;
 
-    if (isHiddenAttributeP(attrid, vendor))
+    if (isHiddenAttributeP(attrid))
         return false;
 
     if (i == -1)
@@ -357,7 +358,8 @@ gss_eap_radius_attr_provider::getFragmentedAttribute(uint16_t attribute,
 }
 
 bool
-gss_eap_radius_attr_provider::getAttribute(uint32_t attrid,
+gss_eap_radius_attr_provider::getAttribute(uint16_t attribute,
+                                           uint16_t vendor,
                                            int *authenticated,
                                            int *complete,
                                            gss_buffer_t value,
@@ -365,7 +367,7 @@ gss_eap_radius_attr_provider::getAttribute(uint32_t attrid,
                                            int *more) const
 {
 
-    return getAttribute(ATTRID(attrid), VENDOR(attrid),
+    return getAttribute(VENDORATTR(attribute, vendor),
                         authenticated, complete,
                         value, display_value, more);
 }
@@ -377,7 +379,7 @@ gss_eap_radius_attr_provider::mapToAny(int authenticated,
     if (authenticated && !m_authenticated)
         return (gss_any_t)NULL;
 
-    return (gss_any_t)paircopy(m_vps);
+    return (gss_any_t)copyAvps(m_vps);
 }
 
 void
@@ -410,13 +412,12 @@ gss_eap_radius_attr_provider::createAttrContext(void)
 
 OM_uint32
 gssEapRadiusAddAvp(OM_uint32 *minor,
-                   rs_handle *rh,
                    VALUE_PAIR **vps,
-                   uint16_t vattrid,
+                   uint16_t attribute,
                    uint16_t vendor,
                    gss_buffer_t buffer)
 {
-    uint32_t attrid = VENDORATTR(vendor, vattrid);
+    uint32_t attrid = VENDORATTR(vendor, attribute);
     unsigned char *p = (unsigned char *)buffer->value;
     size_t remain = buffer->length;
 
@@ -448,11 +449,11 @@ gssEapRadiusAddAvp(OM_uint32 *minor,
 OM_uint32
 gssEapRadiusGetRawAvp(OM_uint32 *minor,
                       VALUE_PAIR *vps,
-                      uint16_t type,
+                      uint16_t attribute,
                       uint16_t vendor,
                       VALUE_PAIR **vp)
 {
-    uint32_t attr = VENDORATTR(vendor, type);
+    uint32_t attr = VENDORATTR(vendor, attribute);
 
     *vp = pairfind(vps, attr);
 
@@ -462,14 +463,14 @@ gssEapRadiusGetRawAvp(OM_uint32 *minor,
 OM_uint32
 gssEapRadiusGetAvp(OM_uint32 *minor,
                    VALUE_PAIR *vps,
-                   uint16_t type,
+                   uint16_t attribute,
                    uint16_t vendor,
                    gss_buffer_t buffer,
                    int concat)
 {
     VALUE_PAIR *vp;
     unsigned char *p;
-    uint32_t attr = VENDORATTR(vendor, type);
+    uint32_t attr = VENDORATTR(vendor, attribute);
 
     buffer->length = 0;
     buffer->value = NULL;
@@ -502,84 +503,29 @@ gssEapRadiusGetAvp(OM_uint32 *minor,
 }
 
 OM_uint32
-gssEapRadiusAttrProviderInit(OM_uint32 *minor)
-{
-    return gss_eap_radius_attr_provider::init()
-        ? GSS_S_COMPLETE : GSS_S_FAILURE;
-}
-
-OM_uint32
-gssEapRadiusAttrProviderFinalize(OM_uint32 *minor)
+gssEapRadiusFreeAvps(OM_uint32 *minor,
+                     VALUE_PAIR **vps)
 {
-    gss_eap_radius_attr_provider::finalize();
+    pairfree(vps);
+    *minor = 0;
     return GSS_S_COMPLETE;
 }
 
-/* partition error namespace so it does not conflict with krb5 */
-#define ERROR_TABLE_BASE_rse (46882560L)
-
-#define RS_TO_COM_ERR(rse)                  ((rse) == RSE_OK ? 0 : (rse) + ERROR_TABLE_BASE_rse)
-#define COM_TO_RS_ERR(err)                  ((err) > ERROR_TABLE_BASE_rse && \
-                                             (err) <= (ERROR_TABLE_BASE_rse + RSE_SOME_ERROR) ? \
-                                             (err) - ERROR_TABLE_BASE_rse : RSE_SOME_ERROR)
-
 OM_uint32
-gssEapRadiusMapError(OM_uint32 *minor,
-                     struct rs_error *err)
+gssEapRadiusAttrProviderInit(OM_uint32 *minor)
 {
-    int code = RSE_OK;
-
-    if (err != NULL)
-        code = rs_err_code(err, 0);
-    else
-        code = RSE_SOME_ERROR;
-
-    *minor = RS_TO_COM_ERR(code);
-
-    gssEapSaveStatusInfo(*minor, "radsec: %s", rs_err_msg(err, 0));
+    if (!gss_eap_radius_attr_provider::init()) {
+        *minor = GSSEAP_RADSEC_INIT_FAILURE;
+        return GSS_S_FAILURE;
+    }
 
-    rs_err_free(err);
-    return GSS_S_FAILURE;
+    return GSS_S_COMPLETE;
 }
 
 OM_uint32
-gssEapRadiusAllocConn(OM_uint32 *minor,
-                      const gss_cred_id_t cred,
-                      gss_ctx_id_t ctx)
-{
-    struct gss_eap_acceptor_ctx *actx = &ctx->acceptorCtx;
-    const char *configFile = NULL;
-    const char *configStanza = "gss-eap";
-    struct rs_error *err;
-
-    assert(actx->radHandle == NULL);
-    assert(actx->radConn == NULL);
-
-    if (cred != GSS_C_NO_CREDENTIAL) {
-        if (cred->radiusConfigFile != NULL)
-            configFile = cred->radiusConfigFile;
-        if (cred->radiusConfigStanza != NULL)
-            configStanza = cred->radiusConfigStanza;
-    }
-
-    err = radiusAllocHandle(configFile, &actx->radHandle);
-    if (err != NULL || actx->radHandle == NULL) {
-        return gssEapRadiusMapError(minor, err);
-    }
-
-    if (rs_conn_create(actx->radHandle, &actx->radConn, configStanza) != 0) {
-        return gssEapRadiusMapError(minor, rs_err_conn_pop(actx->radConn));
-    }
-
-    /* XXX TODO rs_conn_select_server does not exist yet */
-#if 0
-    if (actx->radServer != NULL) {
-        if (rs_conn_select_server(actx->radConn, actx->radServer) != 0)
-            return gssEapRadiusMapError(minor, rs_err_conn_pop(actx->radConn));
-    }
-#endif
-
-    *minor = 0;
+gssEapRadiusAttrProviderFinalize(OM_uint32 *minor)
+{
+    gss_eap_radius_attr_provider::finalize();
     return GSS_S_COMPLETE;
 }
 
@@ -599,8 +545,7 @@ avpSize(const VALUE_PAIR *vp)
 }
 
 static bool
-avpExport(rs_handle *rh,
-          const VALUE_PAIR *vp,
+avpExport(const VALUE_PAIR *vp,
           unsigned char **pBuffer,
           size_t *pRemain)
 {
@@ -633,8 +578,7 @@ avpExport(rs_handle *rh,
 }
 
 static bool
-avpImport(rs_handle *rh,
-          VALUE_PAIR **pVp,
+avpImport(VALUE_PAIR **pVp,
           unsigned char **pBuffer,
           size_t *pRemain)
 {
@@ -642,7 +586,7 @@ avpImport(rs_handle *rh,
     size_t remain = *pRemain;
     VALUE_PAIR *vp = NULL;
     DICT_ATTR *da;
-    OM_uint32 attrid;
+    uint32_t attrid;
 
     if (remain < avpSize(NULL))
         goto fail;
@@ -678,10 +622,14 @@ avpImport(rs_handle *rh,
         break;
     case PW_TYPE_STRING:
         /* check enough room to NUL terminate */
-        if (p[0] >= MAX_STRING_LEN)
+        if (p[0] == MAX_STRING_LEN)
             goto fail;
+        else
         /* fallthrough */
     default:
+        if (p[0] > MAX_STRING_LEN)
+            goto fail;
+
         vp->length = (uint32_t)p[0];
         memcpy(vp->vp_octets, p + 1, vp->length);
 
@@ -710,65 +658,33 @@ gss_eap_radius_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx,
 {
     unsigned char *p = (unsigned char *)buffer->value;
     size_t remain = buffer->length;
-    OM_uint32 configFileLen, count;
     VALUE_PAIR **pNext = &m_vps;
 
     if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
         return false;
 
-    if (remain < 4)
-        return false;
-
-    configFileLen = load_uint32_be(p);
-    p += 4;
-    remain -= 4;
-
-    if (remain < configFileLen)
-        return false;
-
-    std::string configFile((char *)p, configFileLen);
-    p += configFileLen;
-    remain -= configFileLen;
-
-    if (!allocRadHandle(configFile))
-        return false;
-
-    if (remain < 4)
-        return false;
-
-    count = load_uint32_be(p);
-    p += 4;
-    remain -= 4;
-
     do {
         VALUE_PAIR *attr;
 
-        if (!avpImport(m_rh, &attr, &p, &remain))
+        if (!avpImport(&attr, &p, &remain))
             return false;
 
         *pNext = attr;
         pNext = &attr->next;
-
-        count--;
     } while (remain != 0);
 
-    if (count != 0)
-        return false;
-
     return true;
 }
 
 void
 gss_eap_radius_attr_provider::exportToBuffer(gss_buffer_t buffer) const
 {
-    OM_uint32 count = 0;
     VALUE_PAIR *vp;
     unsigned char *p;
-    size_t remain = 4 + m_configFile.length() + 4;
+    size_t remain = 0;
 
     for (vp = m_vps; vp != NULL; vp = vp->next) {
         remain += avpSize(vp);
-        count++;
     }
 
     buffer->value = GSSEAP_MALLOC(remain);
@@ -780,20 +696,8 @@ gss_eap_radius_attr_provider::exportToBuffer(gss_buffer_t buffer) const
 
     p = (unsigned char *)buffer->value;
 
-    store_uint32_be(m_configFile.length(), p);
-    p += 4;
-    remain -= 4;
-
-    memcpy(p, m_configFile.c_str(), m_configFile.length());
-    p += m_configFile.length();
-    remain -= m_configFile.length();
-
-    store_uint32_be(count, p);
-    p += 4;
-    remain -= 4;
-
     for (vp = m_vps; vp != NULL; vp = vp->next) {
-        avpExport(m_rh, vp, &p, &remain);
+        avpExport(vp, &p, &remain);
     }
 
     assert(remain == 0);
@@ -810,3 +714,28 @@ gss_eap_radius_attr_provider::getExpiryTime(void) const
 
     return time(NULL) + vp->lvalue;
 }
+
+/* partition error namespace so it does not conflict with krb5 */
+#define RS_TO_COM_ERR(rse)                  ((rse) == RSE_OK ? 0 : (rse) + ERROR_TABLE_BASE_rse)
+#define COM_TO_RS_ERR(err)                  ((err) > ERROR_TABLE_BASE_rse && \
+                                             (err) <= (ERROR_TABLE_BASE_rse + RSE_SOME_ERROR) ? \
+                                             (err) - ERROR_TABLE_BASE_rse : RSE_SOME_ERROR)
+
+OM_uint32
+gssEapRadiusMapError(OM_uint32 *minor,
+                     struct rs_error *err)
+{
+    int code = RSE_OK;
+
+    if (err != NULL)
+        code = rs_err_code(err, 0);
+    else
+        code = RSE_SOME_ERROR;
+
+    *minor = RS_TO_COM_ERR(code);
+
+    gssEapSaveStatusInfo(*minor, "%s", rs_err_msg(err, 0));
+
+    rs_err_free(err);
+    return GSS_S_FAILURE;
+}