#include "Application.h"
#include "exceptions.h"
#include "ServiceProvider.h"
-#include "attribute/resolver/AttributeResolver.h"
-#include "attribute/resolver/ResolutionContext.h"
#include "handler/AssertionConsumerService.h"
-#include "security/SecurityPolicy.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/Attribute.h"
+# include "attribute/filtering/AttributeFilter.h"
+# include "attribute/filtering/BasicFilteringContext.h"
+# include "attribute/resolver/AttributeExtractor.h"
+# 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, const char* appId, Category& log)
- : AbstractHandler(e, log), m_decoder(NULL), m_configNS(SHIB2SPCONFIG_NS),
- m_role(samlconstants::SAML20MD_NS, opensaml::saml2md::IDPSSODescriptor::LOCAL_NAME)
+ : AbstractHandler(e, log)
+#ifndef SHIBSP_LITE
+ ,m_decoder(NULL), m_role(samlconstants::SAML20MD_NS, opensaml::saml2md::IDPSSODescriptor::LOCAL_NAME)
+#endif
{
string address(appId);
address += getString("Location").second;
- address += "::run::ACS";
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 = SAMLConfig::getConfig().MessageDecoderManager.newPlugin(
+ getString("Binding").second,make_pair(e,shibspconstants::SHIB2SPCONFIG_NS)
+ );
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
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);
}
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)
entityID = issuer.get();
return key;
+#else
+ throw ConfigurationException("Cannot process message using lite version of shibsp library.");
+#endif
}
pair<bool,long> AssertionConsumerService::sendRedirect(
}
}
+#ifndef SHIBSP_LITE
+
+class SHIBSP_DLLLOCAL DummyContext : public ResolutionContext
+{
+public:
+ DummyContext(const vector<Attribute*>& attributes) : m_attributes(attributes) {
+ }
+
+ virtual ~DummyContext() {
+ for_each(m_attributes.begin(), m_attributes.end(), xmltooling::cleanup<Attribute>());
+ }
+
+ vector<Attribute*>& getResolvedAttributes() {
+ return m_attributes;
+ }
+ vector<Assertion*>& getResolvedAssertions() {
+ return m_tokens;
+ }
+
+private:
+ vector<Attribute*> m_attributes;
+ static vector<Assertion*> m_tokens; // never any tokens, so just share an empty vector
+};
+
+vector<Assertion*> DummyContext::m_tokens;
+
ResolutionContext* AssertionConsumerService::resolveAttributes(
const Application& application,
- const saml2md::EntityDescriptor* issuer,
+ const saml2md::RoleDescriptor* issuer,
+ const XMLCh* protocol,
+ const saml1::NameIdentifier* v1nameid,
const saml2::NameID* nameid,
- const vector<const Assertion*>* tokens,
- const multimap<string,Attribute*>* attributes
+ const XMLCh* authncontext_class,
+ const XMLCh* authncontext_decl,
+ const vector<const Assertion*>* tokens
) const
{
+ // First we do the extraction of any pushed information.
+ vector<Attribute*> resolvedAttributes;
+ AttributeExtractor* extractor = application.getAttributeExtractor();
+ if (extractor) {
+ m_log.debug("extracting pushed attributes...");
+ Locker extlocker(extractor);
+ if (v1nameid) {
+ try {
+ extractor->extractAttributes(application, issuer, *v1nameid, resolvedAttributes);
+ }
+ catch (exception& ex) {
+ m_log.error("caught exception extracting attributes: %s", ex.what());
+ }
+ }
+ else if (nameid) {
+ try {
+ extractor->extractAttributes(application, issuer, *nameid, resolvedAttributes);
+ }
+ catch (exception& ex) {
+ m_log.error("caught exception extracting attributes: %s", ex.what());
+ }
+ }
+ if (tokens) {
+ for (vector<const Assertion*>::const_iterator t = tokens->begin(); t!=tokens->end(); ++t) {
+ try {
+ extractor->extractAttributes(application, issuer, *(*t), resolvedAttributes);
+ }
+ catch (exception& ex) {
+ m_log.error("caught exception extracting attributes: %s", ex.what());
+ }
+ }
+ }
+
+ AttributeFilter* filter = application.getAttributeFilter();
+ if (filter && !resolvedAttributes.empty()) {
+ BasicFilteringContext fc(application, resolvedAttributes, issuer, authncontext_class);
+ Locker filtlocker(filter);
+ try {
+ filter->filterAttributes(fc, resolvedAttributes);
+ }
+ catch (exception& ex) {
+ m_log.error("caught exception filtering attributes: %s", ex.what());
+ m_log.error("dumping extracted attributes due to filtering exception");
+ for_each(resolvedAttributes.begin(), resolvedAttributes.end(), xmltooling::cleanup<shibsp::Attribute>());
+ resolvedAttributes.clear();
+ }
+ }
+ }
+
try {
AttributeResolver* resolver = application.getAttributeResolver();
- if (!resolver) {
+ if (!resolver && !resolvedAttributes.empty()) {
m_log.info("no AttributeResolver available, skipping resolution");
- return NULL;
+ return new DummyContext(resolvedAttributes);
}
m_log.debug("resolving attributes...");
Locker locker(resolver);
auto_ptr<ResolutionContext> ctx(
- resolver->createResolutionContext(application, issuer, nameid, tokens, attributes)
+ resolver->createResolutionContext(
+ application,
+ dynamic_cast<const saml2md::EntityDescriptor*>(issuer->getParent()),
+ protocol,
+ nameid,
+ authncontext_class,
+ authncontext_decl,
+ tokens,
+ &resolvedAttributes
+ )
);
resolver->resolveAttributes(*ctx.get());
return ctx.release();
m_log.error("attribute resolution failed: %s", ex.what());
}
+ if (!resolvedAttributes.empty())
+ return new DummyContext(resolvedAttributes);
return NULL;
}
+#endif
void AssertionConsumerService::maintainHistory(SPRequest& request, const char* entityID, const char* cookieProps) const
{
projects / shibboleth / cpp-sp.git / blobdiff