/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
using namespace std;
namespace opensaml {
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory ClientCertAuthRuleFactory;
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory MessageFlowRuleFactory;
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory SAML1MessageRuleFactory;
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory SAML2MessageRuleFactory;
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory SimpleSigningRuleFactory;
- SAML_DLLLOCAL PluginManager<SecurityPolicyRule,const DOMElement*>::Factory XMLSigningRuleFactory;
+ SAML_DLLLOCAL PluginManager<SecurityPolicyRule,string,const DOMElement*>::Factory ClientCertAuthRuleFactory;
+ SAML_DLLLOCAL PluginManager<SecurityPolicyRule,string,const DOMElement*>::Factory MessageFlowRuleFactory;
+ SAML_DLLLOCAL PluginManager<SecurityPolicyRule,string,const DOMElement*>::Factory NullSecurityRuleFactory;
+ SAML_DLLLOCAL PluginManager<SecurityPolicyRule,string,const DOMElement*>::Factory SimpleSigningRuleFactory;
+ SAML_DLLLOCAL PluginManager<SecurityPolicyRule,string,const DOMElement*>::Factory XMLSigningRuleFactory;
};
void SAML_API opensaml::registerSecurityPolicyRules()
SAMLConfig& conf=SAMLConfig::getConfig();
conf.SecurityPolicyRuleManager.registerFactory(CLIENTCERTAUTH_POLICY_RULE, ClientCertAuthRuleFactory);
conf.SecurityPolicyRuleManager.registerFactory(MESSAGEFLOW_POLICY_RULE, MessageFlowRuleFactory);
- conf.SecurityPolicyRuleManager.registerFactory(SAML1MESSAGE_POLICY_RULE, SAML1MessageRuleFactory);
- conf.SecurityPolicyRuleManager.registerFactory(SAML2MESSAGE_POLICY_RULE, SAML2MessageRuleFactory);
+ conf.SecurityPolicyRuleManager.registerFactory(NULLSECURITY_POLICY_RULE, NullSecurityRuleFactory);
conf.SecurityPolicyRuleManager.registerFactory(SIMPLESIGNING_POLICY_RULE, SimpleSigningRuleFactory);
conf.SecurityPolicyRuleManager.registerFactory(XMLSIGNING_POLICY_RULE, XMLSigningRuleFactory);
}
SecurityPolicy::~SecurityPolicy()
{
- reset();
+ reset(false);
}
-void SecurityPolicy::reset()
+void SecurityPolicy::reset(bool messageOnly)
{
- delete m_messageQName;
XMLString::release(&m_messageID);
- delete m_issuer;
- m_messageQName=NULL;
m_messageID=NULL;
m_issueInstant=0;
- m_issuer=NULL;
- m_issuerRole=NULL;
+ if (!messageOnly) {
+ delete m_issuer;
+ m_issuer=NULL;
+ m_issuerRole=NULL;
+ m_authenticated=false;
+ }
}
void SecurityPolicy::evaluate(const XMLObject& message, const GenericRequest* request)
(*i)->evaluate(message,request,*this);
}
-void SecurityPolicy::setIssuer(saml2::Issuer* issuer)
+void SecurityPolicy::setIssuer(const Issuer* issuer)
{
- if (!getIssuerMatchingPolicy().issuerMatches(issuer, m_issuer)) {
- delete issuer;
- throw BindingException("A rule supplied an Issuer that conflicts with previous results.");
+ if (!getIssuerMatchingPolicy().issuerMatches(m_issuer, issuer))
+ throw SecurityPolicyException("An Issuer was supplied that conflicts with previous results.");
+
+ if (!m_issuer) {
+ if (m_entityOnly && issuer->getFormat() && !XMLString::equals(issuer->getFormat(), NameIDType::ENTITY))
+ throw SecurityPolicyException("A non-entity Issuer was supplied, violating policy.");
+ m_issuerRole = NULL;
+ m_issuer=issuer->cloneIssuer();
}
+}
+
+void SecurityPolicy::setIssuer(const XMLCh* issuer)
+{
+ if (!getIssuerMatchingPolicy().issuerMatches(m_issuer, issuer))
+ throw SecurityPolicyException("An Issuer was supplied that conflicts with previous results.");
- delete m_issuer;
- m_issuer=issuer;
+ if (!m_issuer && issuer && *issuer) {
+ m_issuerRole = NULL;
+ m_issuer = IssuerBuilder::buildIssuer();
+ m_issuer->setName(issuer);
+ }
}
void SecurityPolicy::setIssuerMetadata(const RoleDescriptor* issuerRole)
{
if (issuerRole && m_issuerRole && issuerRole!=m_issuerRole)
- throw BindingException("A rule supplied a RoleDescriptor that conflicts with previous results.");
+ throw SecurityPolicyException("A rule supplied a RoleDescriptor that conflicts with previous results.");
m_issuerRole=issuerRole;
}
return true;
}
+
+bool SecurityPolicy::IssuerMatchingPolicy::issuerMatches(const Issuer* issuer1, const XMLCh* issuer2) const
+{
+ // NULL matches anything for the purposes of this interface.
+ if (!issuer1 || !issuer2 || !*issuer2)
+ return true;
+
+ const XMLCh* op1=issuer1->getName();
+ if (!op1 || !XMLString::equals(op1,issuer2))
+ return false;
+
+ op1=issuer1->getFormat();
+ if (op1 && *op1 && !XMLString::equals(op1, NameIDType::ENTITY))
+ return false;
+
+ op1=issuer1->getNameQualifier();
+ if (op1 && *op1)
+ return false;
+
+ op1=issuer1->getSPNameQualifier();
+ if (op1 && *op1)
+ return false;
+
+ return true;
+}