#include "Application.h"
#include "exceptions.h"
#include "ServiceProvider.h"
-#include "attribute/resolver/AttributeResolver.h"
-#include "attribute/resolver/ResolutionContext.h"
#include "handler/AssertionConsumerService.h"
#include "util/SPConstants.h"
-#include <saml/SAMLConfig.h>
-#include <saml/saml1/core/Assertions.h>
-#include <saml/util/CommonDomainCookie.h>
+# include <ctime>
+#ifndef SHIBSP_LITE
+# include "attribute/resolver/AttributeResolver.h"
+# include "attribute/resolver/ResolutionContext.h"
+# include "security/SecurityPolicy.h"
+# include <saml/SAMLConfig.h>
+# include <saml/saml1/core/Assertions.h>
+# include <saml/util/CommonDomainCookie.h>
+using namespace samlconstants;
+#else
+# include "lite/CommonDomainCookie.h"
+#endif
using namespace shibspconstants;
-using namespace samlconstants;
using namespace shibsp;
using namespace opensaml;
using namespace xmltooling;
using namespace log4cpp;
using namespace std;
-AssertionConsumerService::AssertionConsumerService(const DOMElement* e, Category& log)
- : AbstractHandler(e, log), m_configNS(SHIB2SPCONFIG_NS),
- m_role(samlconstants::SAML20MD_NS, opensaml::saml2md::IDPSSODescriptor::LOCAL_NAME)
+AssertionConsumerService::AssertionConsumerService(const DOMElement* e, const char* appId, Category& log)
+ : AbstractHandler(e, log)
+#ifndef SHIBSP_LITE
+ ,m_decoder(NULL), m_role(samlconstants::SAML20MD_NS, opensaml::saml2md::IDPSSODescriptor::LOCAL_NAME)
+#endif
{
- if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess))
+ string address(appId);
+ address += getString("Location").second;
+ setAddress(address.c_str());
+#ifndef SHIBSP_LITE
+ if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
m_decoder = SAMLConfig::getConfig().MessageDecoderManager.newPlugin(getString("Binding").second,e);
+ m_decoder->setArtifactResolver(SPConfig::getConfig().getArtifactResolver());
+ }
+#endif
}
AssertionConsumerService::~AssertionConsumerService()
{
+#ifndef SHIBSP_LITE
delete m_decoder;
+#endif
}
pair<bool,long> AssertionConsumerService::run(SPRequest& request, bool isHandler) const
if (conf.isEnabled(SPConfig::OutOfProcess)) {
// When out of process, we run natively and directly process the message.
// RelayState will be fully handled during message processing.
- string providerId;
- string key = processMessage(request.getApplication(), request, providerId, relayState);
- return sendRedirect(request, key.c_str(), providerId.c_str(), relayState.c_str());
+ string entityID;
+ string key = processMessage(request.getApplication(), request, entityID, relayState);
+ return sendRedirect(request, key.c_str(), entityID.c_str(), relayState.c_str());
}
else {
// When not out of process, we remote all the message processing.
DDF out,in = wrap(request);
DDFJanitor jin(in), jout(out);
- in.addmember("application_id").string(request.getApplication().getId());
try {
out=request.getServiceProvider().getListenerService()->send(in);
}
if (ex.getProperty("RelayState"))
relayState = ex.getProperty("RelayState");
try {
- recoverRelayState(request, relayState);
+ recoverRelayState(request.getApplication(), request, relayState);
}
catch (exception& ex2) {
m_log.error("trapped an error during RelayState recovery while handling an error: %s", ex2.what());
// We invoke RelayState recovery one last time on this side of the boundary.
if (out["RelayState"].isstring())
relayState = out["RelayState"].string();
- recoverRelayState(request, relayState);
+ recoverRelayState(request.getApplication(), request, relayState);
// If it worked, we have a session key.
if (!out["key"].isstring())
throw FatalProfileException("Remote processing of SSO profile did not return a usable session key.");
// Take care of cookie business and wrap it up.
- return sendRedirect(request, out["key"].string(), out["provider_id"].string(), relayState.c_str());
+ return sendRedirect(request, out["key"].string(), out["entity_id"].string(), relayState.c_str());
}
}
catch (XMLToolingException& ex) {
auto_ptr<HTTPRequest> http(getRequest(in));
// Do the work.
- string relayState, providerId;
+ string relayState, entityID;
try {
- string key = processMessage(*app, *http.get(), providerId, relayState);
+ string key = processMessage(*app, *http.get(), entityID, relayState);
// Repack for return to caller.
DDF ret=DDF(NULL).structure();
DDFJanitor jret(ret);
ret.addmember("key").string(key.c_str());
- if (!providerId.empty())
- ret.addmember("provider_id").string(providerId.c_str());
+ if (!entityID.empty())
+ ret.addmember("entity_id").string(entityID.c_str());
if (!relayState.empty())
ret.addmember("RelayState").string(relayState.c_str());
out << ret;
}
string AssertionConsumerService::processMessage(
- const Application& application, HTTPRequest& httpRequest, string& providerId, string& relayState
+ const Application& application, HTTPRequest& httpRequest, string& entityID, string& relayState
) const
{
+#ifndef SHIBSP_LITE
// Locate policy key.
pair<bool,const char*> policyId = getString("policyId", m_configNS.get()); // namespace-qualified if inside handler element
if (!policyId.first)
Locker metadataLocker(application.getMetadataProvider());
// Create the policy.
- SecurityPolicy policy(
- application.getServiceProvider().getPolicyRules(policyId.second),
- application.getMetadataProvider(),
- &m_role,
- application.getTrustEngine(),
- validate.first && validate.second
- );
+ shibsp::SecurityPolicy policy(application, &m_role, validate.first && validate.second);
// Decode the message and process it in a protocol-specific way.
auto_ptr<XMLObject> msg(m_decoder->decode(relayState, httpRequest, policy));
- recoverRelayState(httpRequest, relayState);
+ if (!msg.get())
+ throw BindingException("Failed to decode an SSO protocol response.");
+ recoverRelayState(application, httpRequest, relayState);
string key = implementProtocol(application, httpRequest, policy, settings, *msg.get());
auto_ptr_char issuer(policy.getIssuer() ? policy.getIssuer()->getName() : NULL);
if (issuer.get())
- providerId = issuer.get();
+ entityID = issuer.get();
return key;
+#else
+ throw ConfigurationException("Cannot process message using lite version of shibsp library.");
+#endif
}
pair<bool,long> AssertionConsumerService::sendRedirect(
- SPRequest& request, const char* key, const char* providerId, const char* relayState
+ SPRequest& request, const char* key, const char* entityID, const char* relayState
) const
{
// We've got a good session, so set the session cookie.
request.setCookie(shib_cookie.first.c_str(), k.c_str());
// History cookie.
- maintainHistory(request, providerId, shib_cookie.second);
+ maintainHistory(request, entityID, shib_cookie.second);
// Now redirect to the state value. By now, it should be set to *something* usable.
return make_pair(true, request.sendRedirect(relayState));
}
}
+#ifndef SHIBSP_LITE
ResolutionContext* AssertionConsumerService::resolveAttributes(
const Application& application,
- const HTTPRequest& httpRequest,
const saml2md::EntityDescriptor* issuer,
- const saml2::NameID& nameid,
- const vector<const Assertion*>* tokens
+ const XMLCh* protocol,
+ const saml2::NameID* nameid,
+ const XMLCh* authncontext_class,
+ const XMLCh* authncontext_decl,
+ const vector<const Assertion*>* tokens,
+ const multimap<string,Attribute*>* attributes
) const
{
- AttributeResolver* resolver = application.getAttributeResolver();
- if (!resolver) {
- m_log.info("no AttributeResolver available, skipping resolution");
- return NULL;
- }
-
try {
+ AttributeResolver* resolver = application.getAttributeResolver();
+ if (!resolver) {
+ m_log.info("no AttributeResolver available, skipping resolution");
+ return NULL;
+ }
+
m_log.debug("resolving attributes...");
+
+ Locker locker(resolver);
auto_ptr<ResolutionContext> ctx(
- resolver->createResolutionContext(application, httpRequest.getRemoteAddr().c_str(), issuer, nameid, tokens)
+ resolver->createResolutionContext(application, issuer, protocol, nameid, authncontext_class, authncontext_decl, tokens, attributes)
);
resolver->resolveAttributes(*ctx.get());
return ctx.release();
return NULL;
}
+#endif
-void AssertionConsumerService::maintainHistory(SPRequest& request, const char* providerId, const char* cookieProps) const
+void AssertionConsumerService::maintainHistory(SPRequest& request, const char* entityID, const char* cookieProps) const
{
- if (!providerId)
+ if (!entityID)
return;
const PropertySet* sessionProps=request.getApplication().getPropertySet("Sessions");
// Either leave in memory or set an expiration.
pair<bool,unsigned int> days=sessionProps->getUnsignedInt("idpHistoryDays");
if (!days.first || days.second==0) {
- string c = string(cdc.set(providerId)) + cookieProps;
+ string c = string(cdc.set(entityID)) + cookieProps;
request.setCookie(CommonDomainCookie::CDCName, c.c_str());
}
else {
#endif
char timebuf[64];
strftime(timebuf,64,"%a, %d %b %Y %H:%M:%S GMT",ptime);
- string c = string(cdc.set(providerId)) + cookieProps + "; expires=" + timebuf;
+ string c = string(cdc.set(entityID)) + cookieProps + "; expires=" + timebuf;
request.setCookie(CommonDomainCookie::CDCName, c.c_str());
}
}
projects / shibboleth / sp.git / blobdiff