using namespace xercesc;
using namespace std;
+static const XMLCh
+base64Binary[] = {'b','a','s','e','6','4','B','i','n','a','r','y',0};
+
/*
* gss_eap_saml_assertion_provider is for retrieving the underlying
* assertion.
}
bool
-gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx *manager,
+gss_eap_saml_assertion_provider::initWithExistingContext(const gss_eap_attr_ctx *manager,
const gss_eap_attr_provider *ctx)
{
/* Then we may be creating from an existing attribute context */
assert(m_assertion == NULL);
- if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx))
+ if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx))
return false;
saml = static_cast<const gss_eap_saml_assertion_provider *>(ctx);
}
bool
-gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
+gss_eap_saml_assertion_provider::initWithGssContext(const gss_eap_attr_ctx *manager,
const gss_cred_id_t gssCred,
const gss_ctx_id_t gssCtx)
{
assert(m_assertion == NULL);
- if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
+ if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx))
return false;
/*
/* just add the prefix */
if (m_assertion != NULL)
- ret = addAttribute(this, GSS_C_NO_BUFFER, data);
+ ret = addAttribute(m_manager, this, GSS_C_NO_BUFFER, data);
else
ret = true;
else
return GSS_S_CONTINUE_NEEDED;
+ gssEapSaveStatusInfo(*minor, "%s", e.what());
+
return GSS_S_FAILURE;
}
XMLHelper::serialize(m_assertion->marshall((DOMDocument *)NULL), str);
- duplicateBuffer(str, value);
+ if (value != NULL)
+ duplicateBuffer(str, value);
+ if (display_value != NULL)
+ duplicateBuffer(str, display_value);
+
*more = 0;
return true;
delete ((saml2::Assertion *)input);
}
-void
-gss_eap_saml_assertion_provider::exportToBuffer(gss_buffer_t buffer) const
-{
- buffer->length = 0;
- buffer->value = NULL;
-}
-
-bool
-gss_eap_saml_assertion_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
- const gss_buffer_t buffer GSSEAP_UNUSED)
+const char *
+gss_eap_saml_assertion_provider::prefix(void) const
{
- return false;
+ return "urn:ietf:params:gss-eap:saml-aaa-assertion";
}
bool
gss_eap_saml_assertion_provider::init(void)
{
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION,
- "urn:ietf:params:gss-eap:saml-aaa-assertion",
- createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext);
return true;
}
for (vector<saml2::Attribute*>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
const XMLCh *attributeName, *attributeNameFormat;
- XMLCh *qualifiedName;
XMLCh space[2] = { ' ', 0 };
gss_buffer_desc utf8;
- bool ret;
attributeName = (*a)->getName();
attributeNameFormat = (*a)->getNameFormat();
if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0')
attributeNameFormat = saml2::Attribute::UNSPECIFIED;
- qualifiedName = new XMLCh[XMLString::stringLen(attributeNameFormat) + 1 +
- XMLString::stringLen(attributeName) + 1];
+ XMLCh qualifiedName[XMLString::stringLen(attributeNameFormat) + 1 +
+ XMLString::stringLen(attributeName) + 1];
XMLString::copyString(qualifiedName, attributeNameFormat);
XMLString::catString(qualifiedName, space);
XMLString::catString(qualifiedName, attributeName);
utf8.value = (void *)toUTF8(qualifiedName);
utf8.length = strlen((char *)utf8.value);
- ret = addAttribute(this, &utf8, data);
-
- delete qualifiedName;
-
- if (!ret)
- return ret;
+ if (!addAttribute(m_manager, this, &utf8, data))
+ return false;
}
}
static BaseRefVectorOf<XMLCh> *
decomposeAttributeName(const gss_buffer_t attr)
{
- XMLCh *qualifiedAttr = new XMLCh[attr->length + 1];
- XMLString::transcode((const char *)attr->value, qualifiedAttr, attr->length);
-
- BaseRefVectorOf<XMLCh> *components = XMLString::tokenizeString(qualifiedAttr);
+ BaseRefVectorOf<XMLCh> *components;
+ string str((const char *)attr->value, attr->length);
+ auto_ptr_XMLCh qualifiedAttr(str.c_str());
- delete qualifiedAttr;
+ components = XMLString::tokenizeString(qualifiedAttr.get());
if (components->size() != 2) {
delete components;
attribute->setNameFormat(components->elementAt(0));
attribute->setName(components->elementAt(1));
- XMLCh *xmlValue = new XMLCh[value->length + 1];
- XMLString::transcode((const char *)value->value, xmlValue, attr->length);
-
attributeValue = saml2::AttributeValueBuilder::buildAttributeValue();
- attributeValue->setTextContent(xmlValue);
+ auto_ptr_XMLCh unistr((char *)value->value, value->length);
+ attributeValue->setTextContent(unistr.get());
attribute->getAttributeValues().push_back(attributeValue);
attributeStatement->getAttributes().push_back(attribute);
delete components;
- delete xmlValue;
return true;
}
return (ret != NULL);
}
+static bool
+isBase64EncodedAttributeValueP(const saml2::AttributeValue *av)
+{
+ const xmltooling::QName *type = av->getSchemaType();
+
+ if (type == NULL)
+ return false;
+
+ if (!type->hasNamespaceURI() ||
+ !XMLString::equals(type->getNamespaceURI(), xmlconstants::XSD_NS))
+ return false;
+
+ if (!type->hasLocalPart() ||
+ !XMLString::equals(type->getLocalPart(), base64Binary))
+ return false;
+
+ return true;
+}
+
bool
gss_eap_saml_attr_provider::getAttribute(const gss_buffer_t attr,
int *authenticated,
if (i == -1)
i = 0;
- else if (i >= nvalues)
+ if (i >= nvalues)
return false;
#ifdef __APPLE__
av = (const saml2::AttributeValue *)((void *)(a->getAttributeValues().at(i)));
av = dynamic_cast<const saml2::AttributeValue *>(a->getAttributeValues().at(i));
#endif
if (av != NULL) {
+ bool base64Encoded = isBase64EncodedAttributeValueP(av);
+
if (value != NULL) {
- value->value = toUTF8(av->getTextContent(), true);
- value->length = strlen((char *)value->value);
+ char *stringValue = toUTF8(av->getTextContent(), true);
+ size_t stringValueLen = strlen(stringValue);
+
+ if (base64Encoded) {
+ ssize_t octetLen;
+
+ value->value = GSSEAP_MALLOC(stringValueLen);
+ if (value->value == NULL) {
+ GSSEAP_FREE(stringValue);
+ throw new std::bad_alloc;
+ }
+
+ octetLen = base64Decode(stringValue, value->value);
+ if (octetLen < 0) {
+ GSSEAP_FREE(value->value);
+ GSSEAP_FREE(stringValue);
+ value->value = NULL;
+ return false;
+ }
+ value->length = octetLen;
+ GSSEAP_FREE(stringValue);
+ } else {
+ value->value = stringValue;
+ value->length = stringValueLen;
+ }
}
- if (display_value != NULL) {
+ if (display_value != NULL && base64Encoded == false) {
display_value->value = toUTF8(av->getTextContent(), true);
display_value->length = strlen((char *)value->value);
}
{
}
-void
-gss_eap_saml_attr_provider::exportToBuffer(gss_buffer_t buffer) const
-{
- buffer->length = 0;
- buffer->value = NULL;
-}
-
-bool
-gss_eap_saml_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx GSSEAP_UNUSED,
- const gss_buffer_t buffer GSSEAP_UNUSED)
+const char *
+gss_eap_saml_attr_provider::prefix(void) const
{
- return false;
+ return "urn:ietf:params:gss-eap:saml-attr";
}
bool
gss_eap_saml_attr_provider::init(void)
{
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML,
- "urn:ietf:params:gss-eap:saml-attr",
- createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, createAttrContext);
return true;
}
projects / moonshot.git / blobdiff