#include "handler/SessionInitiator.h"
#include "util/SPConstants.h"
-#include <saml/SAMLConfig.h>
-#include <saml/binding/MessageEncoder.h>
-#include <saml/saml2/core/Protocols.h>
-#include <saml/saml2/metadata/EndpointManager.h>
-#include <saml/saml2/metadata/Metadata.h>
-#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
-
-using namespace shibsp;
+#ifndef SHIBSP_LITE
+# include <saml/SAMLConfig.h>
+# include <saml/binding/MessageEncoder.h>
+# include <saml/saml2/core/Protocols.h>
+# include <saml/saml2/metadata/EndpointManager.h>
+# include <saml/saml2/metadata/Metadata.h>
+# include <saml/saml2/metadata/MetadataCredentialCriteria.h>
using namespace opensaml::saml2;
using namespace opensaml::saml2p;
using namespace opensaml::saml2md;
+#endif
+
+using namespace shibsp;
using namespace opensaml;
using namespace xmltooling;
using namespace log4cpp;
public:
SAML2SessionInitiator(const DOMElement* e, const char* appId);
virtual ~SAML2SessionInitiator() {
+#ifndef SHIBSP_LITE
if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
XMLString::release(&m_outgoing);
for_each(m_encoders.begin(), m_encoders.end(), cleanup_pair<const XMLCh*,MessageEncoder>());
+ delete m_requestTemplate;
}
+#endif
}
void setParent(const PropertySet* parent);
const XMLCh* acsBinding,
bool isPassive,
bool forceAuthn,
+ const char* authnContextClassRef,
+ const char* authnContextComparison,
string& relayState
) const;
string m_appId;
+#ifndef SHIBSP_LITE
XMLCh* m_outgoing;
vector<const XMLCh*> m_bindings;
map<const XMLCh*,MessageEncoder*> m_encoders;
+ AuthnRequest* m_requestTemplate;
+#endif
};
#if defined (_MSC_VER)
};
SAML2SessionInitiator::SAML2SessionInitiator(const DOMElement* e, const char* appId)
- : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator")), m_appId(appId), m_outgoing(NULL)
+ : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".SessionInitiator")), m_appId(appId)
{
- // If Location isn't set, defer address registration until the setParent call.
- pair<bool,const char*> loc = getString("Location");
- if (loc.first) {
- string address = m_appId + loc.second + "::run::SAML2SI";
- setAddress(address.c_str());
- }
-
+#ifndef SHIBSP_LITE
+ m_outgoing=NULL;
+ m_requestTemplate=NULL;
if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
+ // Check for a template AuthnRequest to build from.
+ DOMElement* child = XMLHelper::getFirstChildElement(e, samlconstants::SAML20P_NS, AuthnRequest::LOCAL_NAME);
+ if (child)
+ m_requestTemplate = dynamic_cast<AuthnRequest*>(AuthnRequestBuilder::buildOneFromElement(child));
+
+ // Handle outgoing binding setup.
pair<bool,const XMLCh*> outgoing = getXMLString("outgoingBindings");
if (outgoing.first) {
m_outgoing = XMLString::replicate(outgoing.second);
break;
}
}
+#endif
+
+ // If Location isn't set, defer address registration until the setParent call.
+ pair<bool,const char*> loc = getString("Location");
+ if (loc.first) {
+ string address = m_appId + loc.second + "::run::SAML2SI";
+ setAddress(address.c_str());
+ }
}
void SAML2SessionInitiator::setParent(const PropertySet* parent)
if (isHandler) {
option=request.getParameter("acsIndex");
- if (option)
+ if (option) {
ACS = app.getAssertionConsumerServiceByIndex(atoi(option));
+ if (!ACS)
+ throw ConfigurationException("AssertionConsumerService with index ($1) not found, check configuration.", params(1,option));
+ }
option = request.getParameter("target");
if (option)
target = option;
- if (!acsByIndex.first || !acsByIndex.second) {
+ if (acsByIndex.first && !acsByIndex.second) {
// Since we're passing the ACS by value, we need to compute the return URL,
// so we'll need the target resource for real.
recoverRelayState(request.getApplication(), request, target, false);
SPConfig& conf = SPConfig::getConfig();
if (conf.isEnabled(SPConfig::OutOfProcess)) {
- if (acsByIndex.first && acsByIndex.second) {
+ if (!acsByIndex.first || acsByIndex.second) {
// Pass by Index. This also allows for defaulting it entirely and sending nothing.
if (isHandler) {
// We may already have RelayState set if we looped back here,
target = option;
}
return doRequest(
- app, request, entityID, ACS ? ACS->getXMLString("index").second : NULL, NULL, NULL, isPassive, forceAuthn, target
+ app, request, entityID,
+ ACS ? ACS->getXMLString("index").second : NULL, NULL, NULL,
+ isPassive, forceAuthn,
+ acClass.first ? acClass.second : NULL,
+ acComp.first ? acComp.second : NULL,
+ target
);
}
}
return doRequest(
- app, request, entityID, NULL, ACSloc.c_str(), ACS ? ACS->getXMLString("Binding").second : NULL, isPassive, forceAuthn, target
+ app, request, entityID,
+ NULL, ACSloc.c_str(), ACS ? ACS->getXMLString("Binding").second : NULL,
+ isPassive, forceAuthn,
+ acClass.first ? acClass.second : NULL,
+ acComp.first ? acComp.second : NULL,
+ target
);
}
in.addmember("authnContextClassRef").string(acClass.second);
if (acComp.first)
in.addmember("authnContextComparison").string(acComp.second);
- if (acsByIndex.first && acsByIndex.second) {
+ if (!acsByIndex.first || acsByIndex.second) {
if (ACS)
in.addmember("acsIndex").string(ACS->getString("index").second);
}
*app, *http.get(), entityID,
index.get(), in["acsLocation"].string(), bind.get(),
in["isPassive"].integer()==1, in["forceAuthn"].integer()==1,
+ in["authnContextClassRef"].string(), in["authnContextComparison"].string(),
relayState
);
out << ret;
const XMLCh* acsBinding,
bool isPassive,
bool forceAuthn,
+ const char* authnContextClassRef,
+ const char* authnContextComparison,
string& relayState
) const
{
+#ifndef SHIBSP_LITE
// Use metadata to locate the IdP's SSO service.
MetadataProvider* m=app.getMetadataProvider();
Locker locker(m);
const EntityDescriptor* entity=m->getEntityDescriptor(entityID);
if (!entity) {
m_log.error("unable to locate metadata for provider (%s)", entityID);
- return make_pair(false,0);
+ throw MetadataException("Unable to locate metadata for identity provider ($entityID)",
+ namedparams(1, "entityID", entityID));
}
const IDPSSODescriptor* role=entity->getIDPSSODescriptor(samlconstants::SAML20P_NS);
if (!role) {
preserveRelayState(app, httpResponse, relayState);
- // For now just build a dummy AuthnRequest.
- auto_ptr<AuthnRequest> req(AuthnRequestBuilder::buildAuthnRequest());
+ auto_ptr<AuthnRequest> req(m_requestTemplate ? m_requestTemplate->cloneAuthnRequest() : AuthnRequestBuilder::buildAuthnRequest());
+ if (m_requestTemplate) {
+ // Freshen TS and ID.
+ req->setID(NULL);
+ req->setIssueInstant(time(NULL));
+ }
+
req->setDestination(ep->getLocation());
- if (acsIndex)
+ if (acsIndex && *acsIndex)
req->setAssertionConsumerServiceIndex(acsIndex);
if (acsLocation) {
auto_ptr_XMLCh wideloc(acsLocation);
req->setAssertionConsumerServiceURL(wideloc.get());
}
- if (acsBinding)
+ if (acsBinding && *acsBinding)
req->setProtocolBinding(acsBinding);
if (isPassive)
req->IsPassive(isPassive);
else if (forceAuthn)
req->ForceAuthn(forceAuthn);
- Issuer* issuer = IssuerBuilder::buildIssuer();
- req->setIssuer(issuer);
- issuer->setName(app.getXMLString("providerId").second);
+ if (!req->getIssuer()) {
+ Issuer* issuer = IssuerBuilder::buildIssuer();
+ req->setIssuer(issuer);
+ issuer->setName(app.getXMLString("entityID").second);
+ }
+ if (!req->getNameIDPolicy()) {
+ NameIDPolicy* namepol = NameIDPolicyBuilder::buildNameIDPolicy();
+ req->setNameIDPolicy(namepol);
+ namepol->AllowCreate(true);
+ }
+ if (authnContextClassRef || authnContextComparison) {
+ RequestedAuthnContext* reqContext = req->getRequestedAuthnContext();
+ if (!reqContext) {
+ reqContext = RequestedAuthnContextBuilder::buildRequestedAuthnContext();
+ req->setRequestedAuthnContext(reqContext);
+ }
+ if (authnContextClassRef) {
+ reqContext->getAuthnContextDeclRefs().clear();
+ auto_ptr_XMLCh wideclass(authnContextClassRef);
+ AuthnContextClassRef* cref = AuthnContextClassRefBuilder::buildAuthnContextClassRef();
+ cref->setReference(wideclass.get());
+ reqContext->getAuthnContextClassRefs().push_back(cref);
+ }
+ if (authnContextComparison &&
+ (!reqContext->getAuthnContextClassRefs().empty() || !reqContext->getAuthnContextDeclRefs().empty())) {
+ auto_ptr_XMLCh widecomp(authnContextComparison);
+ reqContext->setComparison(widecomp.get());
+ }
+ }
auto_ptr_char dest(ep->getLocation());
// Fill in criteria to use.
MetadataCredentialCriteria mcc(*role);
mcc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);
+ pair<bool,const char*> keyName = relyingParty->getString("keyName");
+ if (keyName.first)
+ mcc.getKeyNames().insert(keyName.second);
pair<bool,const XMLCh*> sigalg = relyingParty->getXMLString("signatureAlg");
if (sigalg.first)
mcc.setXMLAlgorithm(sigalg.second);
long ret = encoder->encode(httpResponse, req.get(), dest.get(), entityID, relayState.c_str());
req.release(); // freed by encoder
return make_pair(true,ret);
+#else
+ return make_pair(false,0);
+#endif
}
projects / shibboleth / sp.git / blobdiff