using saml2::NameID;
using saml2::NameIDBuilder;
using saml2md::EntityDescriptor;
+using saml2md::SPSSODescriptor;
+using saml2md::MetadataException;
#else
# include "lite/SAMLConstants.h"
#endif
}
virtual ~SAML1Consumer() {}
- private:
#ifndef SHIBSP_LITE
- string implementProtocol(
+ void generateMetadata(SPSSODescriptor& role, const char* handlerURL) const {
+ AssertionConsumerService::generateMetadata(role, handlerURL);
+ role.addSupport(samlconstants::SAML11_PROTOCOL_ENUM);
+ role.addSupport(samlconstants::SAML10_PROTOCOL_ENUM);
+ }
+
+ private:
+ void implementProtocol(
const Application& application,
const HTTPRequest& httpRequest,
+ HTTPResponse& httpResponse,
SecurityPolicy& policy,
const PropertySet* settings,
const XMLObject& xmlObject
#ifndef SHIBSP_LITE
-string SAML1Consumer::implementProtocol(
+void SAML1Consumer::implementProtocol(
const Application& application,
const HTTPRequest& httpRequest,
+ HTTPResponse& httpResponse,
SecurityPolicy& policy,
const PropertySet* settings,
const XMLObject& xmlObject
// Implementation of SAML 1.x SSO profile(s).
m_log.debug("processing message against SAML 1.x SSO profile");
+ // Check for errors...this will throw if it's not a successful message.
+ checkError(&xmlObject);
+
// With the binding aspects now moved out to the MessageDecoder,
// the focus here is on the assertion content. For SAML 1.x POST,
// all the security comes from the protocol layer, and signing
// the assertion isn't sufficient. So we can check the policy
- // object now and bail if it's not a secure message.
- if (m_post && !policy.isSecure())
+ // object now and bail if it's not a secured message.
+ if (m_post && !policy.isAuthenticated()) {
+ if (policy.getIssuer() && !policy.getIssuerMetadata())
+ throw MetadataException("Security of SAML 1.x SSO POST response not established.");
throw SecurityPolicyException("Security of SAML 1.x SSO POST response not established.");
+ }
// Remember whether we already established trust.
- bool alreadySecured = policy.isSecure();
-
- // Check for errors...this will throw if it's not a successful message.
- checkError(&xmlObject);
+ bool alreadySecured = policy.isAuthenticated();
const Response* response = dynamic_cast<const Response*>(&xmlObject);
if (!response)
if (assertions.empty())
throw FatalProfileException("Incoming message contained no SAML assertions.");
+ pair<bool,int> minor = response->getMinorVersion();
+
// Maintain list of "legit" tokens to feed to SP subsystems.
const AuthenticationStatement* ssoStatement=NULL;
vector<const opensaml::Assertion*> tokens;
// With this flag on, we ignore any unsigned assertions.
pair<bool,bool> flag = settings->getBool("signedAssertions");
+ // authnskew allows rejection of SSO if AuthnInstant is too old.
+ const PropertySet* sessionProps = application.getPropertySet("Sessions");
+ pair<bool,unsigned int> authnskew = sessionProps ? sessionProps->getUnsignedInt("authnskew") : pair<bool,unsigned int>(false,0);
+
+ // Saves off error messages potentially helpful for users.
+ string contextualError;
+
for (vector<saml1::Assertion*>::const_iterator a = assertions.begin(); a!=assertions.end(); ++a) {
// Skip unsigned assertion?
if (!(*a)->getSignature() && flag.first && flag.second) {
try {
// We clear the security flag, so we can tell whether the token was secured on its own.
- policy.setSecure(false);
-
- // Run the policy over the assertion. Handles issuer consistency, replay, freshness,
- // and signature verification, assuming the relevant rules are configured.
+ policy.setAuthenticated(false);
+ policy.reset(true);
+
+ // Extract message bits and re-verify Issuer information.
+ extractMessageDetails(
+ *(*a), (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM, policy
+ );
+
+ // Run the policy over the assertion. Handles replay, freshness, and
+ // signature verification, assuming the relevant rules are configured.
policy.evaluate(*(*a));
// If no security is in place now, we kick it.
- if (!alreadySecured && !policy.isSecure()) {
+ if (!alreadySecured && !policy.isAuthenticated()) {
m_log.warn("unable to establish security of assertion");
badtokens.push_back(*a);
continue;
tokens.push_back(*a);
// Save off the first valid SSO statement.
- if (!ssoStatement && !(*a)->getAuthenticationStatements().empty())
- ssoStatement = (*a)->getAuthenticationStatements().front();
+ const vector<AuthenticationStatement*>& statements = const_cast<const saml1::Assertion*>(*a)->getAuthenticationStatements();
+ for (vector<AuthenticationStatement*>::const_iterator s = statements.begin(); s!=statements.end(); ++s) {
+ if (authnskew.first && authnskew.second &&
+ (*s)->getAuthenticationInstant() && (now - (*s)->getAuthenticationInstantEpoch() > authnskew.second))
+ contextualError = "The gap between now and the time you logged into your identity provider exceeds the limit.";
+ else if (!ssoStatement) {
+ ssoStatement = *s;
+ break;
+ }
+ }
}
catch (exception& ex) {
m_log.warn("detected a problem with assertion: %s", ex.what());
}
}
- if (!ssoStatement)
- throw FatalProfileException("A valid authentication statement was not found in the incoming message.");
+ if (!ssoStatement) {
+ if (contextualError.empty())
+ throw FatalProfileException("A valid authentication statement was not found in the incoming message.");
+ throw FatalProfileException(contextualError.c_str());
+ }
// Address checking.
SubjectLocality* locality = ssoStatement->getSubjectLocality();
// Now we have to extract the authentication details for attribute and session setup.
// Session expiration for SAML 1.x is purely SP-driven, and the method is mapped to a ctx class.
- const PropertySet* sessionProps = application.getPropertySet("Sessions");
pair<bool,unsigned int> lifetime = sessionProps ? sessionProps->getUnsignedInt("lifetime") : pair<bool,unsigned int>(true,28800);
if (!lifetime.first || lifetime.second == 0)
lifetime.second = 28800;
// Now merge in bad tokens for caching.
tokens.insert(tokens.end(), badtokens.begin(), badtokens.end());
- return application.getServiceProvider().getSessionCache()->insert(
+ application.getServiceProvider().getSessionCache()->insert(
now + lifetime.second,
application,
- httpRequest.getRemoteAddr().c_str(),
+ httpRequest,
+ httpResponse,
policy.getIssuerMetadata() ? dynamic_cast<const EntityDescriptor*>(policy.getIssuerMetadata()->getParent()) : NULL,
(!response->getMinorVersion().first || response->getMinorVersion().second==1) ?
samlconstants::SAML11_PROTOCOL_ENUM : samlconstants::SAML10_PROTOCOL_ENUM,
projects / shibboleth / cpp-sp.git / blobdiff