#include "internal.h"
#include "exceptions.h"
#include "RootObject.h"
-#include "saml1/binding/SAML1MessageRule.h"
+#include "binding/SecurityPolicyRule.h"
#include "saml1/core/Assertions.h"
#include "saml1/core/Protocols.h"
#include "saml2/core/Assertions.h"
using namespace std;
namespace opensaml {
+
+ class SAML_DLLLOCAL SAML1MessageRule : public SecurityPolicyRule
+ {
+ public:
+ SAML1MessageRule(const DOMElement* e) {}
+ virtual ~SAML1MessageRule() {}
+
+ void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+ };
+
SecurityPolicyRule* SAML_DLLLOCAL SAML1MessageRuleFactory(const DOMElement* const & e)
{
return new SAML1MessageRule(e);
const QName& q = message.getElementQName();
policy.setMessageQName(&q);
- if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1P_NS)) {
- log.debug("not a SAML 1.x protocol message");
+ if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1P_NS) &&
+ !XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1_NS)) {
return;
}
-
try {
const RootObject& samlRoot = dynamic_cast<const RootObject&>(message);
log.debug("extracting issuer from message");
- // Only samlp:Response is known to carry issuer (via payload) in standard SAML 1.x.
const XMLCh* protocol = NULL;
- if (XMLString::equals(q.getLocalPart(), Response::LOCAL_NAME)) {
+ const saml1::Assertion* a = NULL;
+
+ // Handle assertions directly.
+ if (XMLString::equals(q.getLocalPart(), saml1::Assertion::LOCAL_NAME))
+ a = dynamic_cast<const saml1::Assertion*>(&samlRoot);
+
+ // Only samlp:Response is known to carry issuer (via payload) in standard SAML 1.x.
+ if (!a && XMLString::equals(q.getLocalPart(), Response::LOCAL_NAME)) {
// Should be a samlp:Response.
const vector<saml1::Assertion*>& assertions = dynamic_cast<const saml1p::Response&>(samlRoot).getAssertions();
- if (!assertions.empty()) {
- const saml1::Assertion* a = assertions.front();
- if (a->getIssuer()) {
- auto_ptr<saml2::Issuer> issuer(saml2::IssuerBuilder::buildIssuer());
- issuer->setName(a->getIssuer());
- policy.setIssuer(issuer.get());
- issuer.release(); // owned by policy now
- pair<bool,int> minor = a->getMinorVersion();
- protocol = (minor.first && minor.second==0) ?
- samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM;
- }
+ if (!assertions.empty())
+ a = assertions.front();
+ }
+
+ if (a && a->getIssuer()) {
+ if (!policy.getIssuer() || policy.getIssuer()->getFormat() ||
+ !XMLString::equals(policy.getIssuer()->getName(), a->getIssuer())) {
+ // We either have a conflict, or a first-time set of Issuer.
+ auto_ptr<saml2::Issuer> issuer(saml2::IssuerBuilder::buildIssuer());
+ issuer->setName(a->getIssuer());
+ policy.setIssuer(issuer.get());
+ issuer.release(); // owned by policy now
}
+ pair<bool,int> minor = a->getMinorVersion();
+ protocol = (minor.first && minor.second==0) ?
+ samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM;
}
if (!protocol) {
log.debug("message from (%s)", iname.get());
}
+ if (policy.getIssuerMetadata()) {
+ log.debug("metadata for issuer already set, leaving in place");
+ return;
+ }
+
if (policy.getMetadataProvider() && policy.getRole()) {
log.debug("searching metadata for message issuer...");
const EntityDescriptor* entity = policy.getMetadataProvider()->getEntityDescriptor(policy.getIssuer()->getName());