/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
}
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;
}
bool
-gss_eap_saml_assertion_provider::setAttribute(int complete,
+gss_eap_saml_assertion_provider::setAttribute(int complete GSSEAP_UNUSED,
const gss_buffer_t attr,
const gss_buffer_t value)
{
}
bool
-gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value)
+gss_eap_saml_assertion_provider::deleteAttribute(const gss_buffer_t value GSSEAP_UNUSED)
{
delete m_assertion;
m_assertion = NULL;
else
return GSS_S_CONTINUE_NEEDED;
+ gssEapSaveStatusInfo(*minor, "%s", e.what());
+
return GSS_S_FAILURE;
}
int *authenticated,
int *complete,
gss_buffer_t value,
- gss_buffer_t display_value,
+ gss_buffer_t display_value GSSEAP_UNUSED,
int *more) const
{
string str;
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;
gss_any_t
gss_eap_saml_assertion_provider::mapToAny(int authenticated,
- gss_buffer_t type_id) const
+ gss_buffer_t type_id GSSEAP_UNUSED) const
{
if (authenticated && !m_authenticated)
return (gss_any_t)NULL;
}
void
-gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id,
+gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
gss_any_t input) const
{
delete ((saml2::Assertion *)input);
}
-void
-gss_eap_saml_assertion_provider::exportToBuffer(gss_buffer_t buffer) const
-{
- ostringstream sink;
- string str;
-
- buffer->length = 0;
- buffer->value = NULL;
-
- if (m_assertion == NULL)
- return;
-
- sink << *m_assertion;
- str = sink.str();
-
- duplicateBuffer(str, buffer);
-}
-
-bool
-gss_eap_saml_assertion_provider::initFromBuffer(const gss_eap_attr_ctx *ctx,
- const gss_buffer_t buffer)
+const char *
+gss_eap_saml_assertion_provider::prefix(void) const
{
- if (!gss_eap_attr_provider::initFromBuffer(ctx, buffer))
- return false;
-
- if (buffer->length == 0)
- return true;
-
- assert(m_assertion == NULL);
-
- setAssertion(buffer);
- /* TODO XXX how to propagate authenticated flag? */
-
- return true;
+ 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",
- gss_eap_saml_assertion_provider::createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext);
return true;
}
const_cast<const saml2::AttributeStatement*>(*s)->getAttributes();
for (vector<saml2::Attribute*>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
- const XMLCh *attributeName = (*a)->getName();
- const XMLCh *attributeNameFormat = (*a)->getNameFormat();
- XMLCh *qualifiedName;
+ const XMLCh *attributeName, *attributeNameFormat;
XMLCh space[2] = { ' ', 0 };
gss_buffer_desc utf8;
- bool ret;
- qualifiedName = new XMLCh[XMLString::stringLen(attributeNameFormat) + 1 +
- XMLString::stringLen(attributeName) + 1];
+ attributeName = (*a)->getName();
+ attributeNameFormat = (*a)->getNameFormat();
+ if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0')
+ attributeNameFormat = saml2::Attribute::UNSPECIFIED;
+
+ 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;
return components;
}
+static bool
+isNotPrintable(const gss_buffer_t value)
+{
+ size_t i;
+ char *p = (char *)value->value;
+
+ if (isgraph(p[0]) &&
+ isgraph(p[value->length - 1]))
+ {
+ for (i = 0; p[i]; i++) {
+ if (!isascii(p[i]) || !isprint(p[i]))
+ return true;
+ }
+ return false;
+ }
+
+ return true;
+}
+
bool
-gss_eap_saml_attr_provider::setAttribute(int complete,
+gss_eap_saml_attr_provider::setAttribute(int complete GSSEAP_UNUSED,
const gss_buffer_t attr,
const gss_buffer_t value)
{
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);
+ if (isNotPrintable(value)) {
+ char *b64;
+
+ if (base64Encode(value->value, value->length, &b64))
+ return false;
+
+ auto_ptr_XMLCh unistr(b64);
+ attributeValue->setTextContent(unistr.get());
+ } else {
+ auto_ptr_XMLCh unistr((char *)value->value);
+ attributeValue->setTextContent(unistr.get());
+ }
attribute->getAttributeValues().push_back(attributeValue);
attributeStatement->getAttributes().push_back(attribute);
delete components;
- delete xmlValue;
return true;
}
const_cast<const saml2::AttributeStatement*>(*s)->getAttributes();
for (vector<saml2::Attribute *>::const_iterator a = attrs.begin(); a != attrs.end(); ++a) {
- if (XMLString::equals((*a)->getNameFormat(), components->elementAt(0)) &&
- XMLString::equals((*a)->getName(), components->elementAt(1))) {
+ const XMLCh *attributeName, *attributeNameFormat;
+
+ attributeName = (*a)->getName();
+ attributeNameFormat = (*a)->getNameFormat();
+ if (attributeNameFormat == NULL || attributeNameFormat[0] == '\0')
+ attributeNameFormat = saml2::Attribute::UNSPECIFIED;
+
+ if (XMLString::equals(attributeNameFormat, components->elementAt(0)) &&
+ XMLString::equals(attributeName, components->elementAt(1))) {
ret = *a;
break;
}
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)));
#endif
if (av != NULL) {
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 (base64Valid(stringValue)) {
+ ssize_t binaryLen;
+
+ value->value = GSSEAP_MALLOC(stringValueLen);
+ if (value->value == NULL)
+ throw new std::bad_alloc;
+
+ binaryLen = base64Decode(stringValue, value->value);
+ if (binaryLen < 0) {
+ GSSEAP_FREE(value->value);
+ value->value = NULL;
+ return false;
+ }
+ value->length = binaryLen;
+ } else {
+ value->value = stringValue;
+ value->length = stringValueLen;
+ }
}
if (display_value != NULL) {
display_value->value = toUTF8(av->getTextContent(), true);
}
gss_any_t
-gss_eap_saml_attr_provider::mapToAny(int authenticated,
- gss_buffer_t type_id) const
+gss_eap_saml_attr_provider::mapToAny(int authenticated GSSEAP_UNUSED,
+ gss_buffer_t type_id GSSEAP_UNUSED) const
{
return (gss_any_t)NULL;
}
void
-gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id,
- gss_any_t input) const
+gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
+ gss_any_t input GSSEAP_UNUSED) const
{
}
-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,
- const gss_buffer_t buffer)
+const char *
+gss_eap_saml_attr_provider::prefix(void) const
{
- return gss_eap_attr_provider::initFromBuffer(ctx, buffer);
+ 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",
- gss_eap_saml_attr_provider::createAttrContext);
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML, createAttrContext);
return true;
}
{
gss_eap_saml_attr_provider::finalize();
gss_eap_saml_assertion_provider::finalize();
+
+ *minor = 0;
return GSS_S_COMPLETE;
}
projects / moonshot.git / blobdiff