if (radius->m_vps != NULL)
m_vps = copyAvps(const_cast<VALUE_PAIR *>(radius->getAvps()));
+ m_authenticated = radius->m_authenticated;
+
return true;
}
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 (gssCtx != GSS_C_NO_CONTEXT) {
if (gssCtx->acceptorCtx.vps != NULL) {
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;
}
}
OM_uint32
gssEapRadiusAttrProviderInit(OM_uint32 *minor)
{
- return gss_eap_radius_attr_provider::init()
- ? GSS_S_COMPLETE : GSS_S_FAILURE;
-}
+ if (!gss_eap_radius_attr_provider::init()) {
+ *minor = GSSEAP_RADSEC_INIT_FAILURE;
+ return GSS_S_FAILURE;
+ }
-OM_uint32
-gssEapRadiusAttrProviderFinalize(OM_uint32 *minor)
-{
- gss_eap_radius_attr_provider::finalize();
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)
-{
- 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));
-
- rs_err_free(err);
- return GSS_S_FAILURE;
-}
-
OM_uint32
-gssEapRadiusAllocConn(OM_uint32 *minor,
- const gss_cred_id_t cred,
- gss_ctx_id_t ctx)
+gssEapRadiusAttrProviderFinalize(OM_uint32 *minor)
{
- 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->radHandle == NULL);
- assert(actx->radConn == NULL);
-
- if (rs_context_create(&actx->radHandle, RS_DICT_FILE) != 0)
- 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->radHandle, &ralloc);
-
- if (rs_context_read_config(actx->radHandle, configFile) != 0) {
- err = rs_err_ctx_pop(actx->radHandle);
- goto fail;
- }
-
- if (rs_conn_create(actx->radHandle, &actx->radConn, configStanza) != 0) {
- err = rs_err_conn_pop(actx->radConn);
- goto fail;
- }
-
- /* 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) {
- err = rs_err_conn_pop(actx->radConn);
- goto fail;
- }
- }
-#endif
-
- *minor = 0;
+ gss_eap_radius_attr_provider::finalize();
return GSS_S_COMPLETE;
-
-fail:
- OM_uint32 major = gssEapRadiusMapError(minor, err);
-
- if (actx->radConn != NULL) {
- rs_conn_destroy(actx->radConn);
- actx->radConn = NULL;
- }
-
- if (actx->radHandle != NULL) {
- rs_context_destroy(actx->radHandle);
- actx->radHandle = NULL;
- }
-
- return major;
}
/*
{
unsigned char *p = (unsigned char *)buffer->value;
size_t remain = buffer->length;
- uint32_t count;
VALUE_PAIR **pNext = &m_vps;
if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
return false;
- if (remain < 4)
- return false;
-
- count = load_uint32_be(p);
- p += 4;
- remain -= 4;
-
do {
VALUE_PAIR *attr;
*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
{
- uint32_t count = 0;
VALUE_PAIR *vp;
unsigned char *p;
- size_t remain = 4;
+ size_t remain = 0;
for (vp = m_vps; vp != NULL; vp = vp->next) {
remain += avpSize(vp);
- count++;
}
buffer->value = GSSEAP_MALLOC(remain);
p = (unsigned char *)buffer->value;
- store_uint32_be(count, p);
- p += 4;
- remain -= 4;
-
for (vp = m_vps; vp != NULL; vp = vp->next) {
avpExport(vp, &p, &remain);
}
return time(NULL) + vp->lvalue;
}
+
+OM_uint32
+gssEapRadiusMapError(OM_uint32 *minor,
+ struct rs_error *err)
+{
+ int code;
+
+ assert(err != NULL);
+
+ code = rs_err_code(err, 0);
+
+ if (code == RSE_OK) {
+ *minor = 0;
+ return GSS_S_COMPLETE;
+ }
+
+ *minor = ERROR_TABLE_BASE_rse + code;
+
+ gssEapSaveStatusInfo(*minor, "%s", rs_err_msg(err, 0));
+ rs_err_free(err);
+
+ return GSS_S_FAILURE;
+}
projects / mech_eap.orig / blobdiff