#define RS_MAP_ERROR(code) (ERROR_TABLE_BASE_rse + (code))
-static gss_buffer_desc radiusUrnPrefix = {
- sizeof("urn:x-radius:") - 1,
- (void *)"urn:x-radius:"
-};
-
static rs_avp *copyAvps(rs_const_avp *src);
static OM_uint32
switch (attrid.first) {
case VENDORPEC_UKERNA:
switch (attrid.second) {
- case PW_GSS_ACCEPTOR_SERVICE_NAME:
- case PW_GSS_ACCEPTOR_HOST_NAME:
- case PW_GSS_ACCEPTOR_SERVICE_SPECIFIC:
- case PW_GSS_ACCEPTOR_REALM_NAME:
case PW_SAML_AAA_ASSERTION:
bInternalAttribute = true;
break;
break;
}
break;
+ case 0:
+ switch (attrid.second) {
+ case PW_GSS_ACCEPTOR_SERVICE_NAME:
+ case PW_GSS_ACCEPTOR_HOST_NAME:
+ case PW_GSS_ACCEPTOR_SERVICE_SPECIFICS:
+ case PW_GSS_ACCEPTOR_REALM_NAME:
+ bInternalAttribute = true;
+ break;
+ default:
+ break;
+ }
+ break;
default:
break;
}
if (alreadyAddedAttributeP(seen, attrid))
continue;
- if (attrid.second != 0) {
- snprintf(buf, sizeof(buf), "%s%u.%u",
- (char *)radiusUrnPrefix.value, attrid.first, attrid.second);
- } else {
- snprintf(buf, sizeof(buf), "%s%u",
- (char *)radiusUrnPrefix.value, attrid.second);
- }
+ if (rs_attr_display_name(attrid.second, attrid.first,
+ buf, sizeof(buf), TRUE) != RSE_OK ||
+ strncmp(buf, "Attr-", 5) != 0)
+ continue;
- desc.value = buf;
- desc.length = strlen(buf);
+ desc.value = &buf[5];
+ desc.length = strlen((char *)desc.value);
if (!addAttribute(m_manager, this, &desc, data))
return false;
getAttributeId(const gss_buffer_t desc,
gss_eap_attrid *attrid)
{
- OM_uint32 tmpMinor;
- gss_buffer_desc strAttr = GSS_C_EMPTY_BUFFER;
- char *s;
- bool ret;
+ char *strAttr, *s;
+ int canon, code;
- if (desc->length < radiusUrnPrefix.length ||
- memcmp(desc->value, radiusUrnPrefix.value, radiusUrnPrefix.length) != 0)
+ if (desc->length == 0)
return false;
+ canon = isdigit(*(char *)desc->value);
+
/* need to duplicate because attr may not be NUL terminated */
- duplicateBuffer(*desc, &strAttr);
- s = (char *)strAttr.value + radiusUrnPrefix.length;
+ strAttr = (char *)GSSEAP_MALLOC((canon ? 5 : 0) + desc->length + 1);
+ if (strAttr == NULL)
+ throw new std::bad_alloc();
- if (!isdigit(*s)) {
- /* No digits */
- ret = rs_attr_find(s, &attrid->second, &attrid->first);
- } else {
- char *s2;
- unsigned int tmp = strtoul(s, &s2, 10);
-
- if (s2 == NULL) {
- /* Non-vendor attrbiute */
- attrid->first = 0;
- attrid->second = tmp;
- ret = true;
- } else if (*s2 == '.') {
- /* Vendor attributes formatted as Vendor.Attribute */
- attrid->first = tmp;
- attrid->second = strtoul(s2 + 1, NULL, 10);
- ret = true;
- } else {
- ret = false;
- }
+ s = strAttr;
+
+ if (canon) {
+ memcpy(s, "Attr-", 5);
+ s += 5;
}
- gss_release_buffer(&tmpMinor, &strAttr);
+ memcpy(s, desc->value, desc->length);
+ s += desc->length;
+ *s = '\0';
+
+ code = rs_attr_parse_name(strAttr, &attrid->second, &attrid->first);
+
+ GSSEAP_FREE(strAttr);
- return ret;
+ return (code == RSE_OK);
}
bool
const char *
gss_eap_radius_attr_provider::prefix(void) const
{
- return "urn:ietf:params:gss-eap:radius-avp";
+ return "urn:ietf:params:gss:radius-attribute";
}
JSONObject