class SAML_DLLLOCAL ClientCertAuthRule : public SecurityPolicyRule
{
public:
- ClientCertAuthRule(const DOMElement* e) {}
+ ClientCertAuthRule(const DOMElement* e);
virtual ~ClientCertAuthRule() {}
const char* getType() const {
return CLIENTCERTAUTH_POLICY_RULE;
}
void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+
+ private:
+ bool m_errorFatal;
};
SecurityPolicyRule* SAML_DLLLOCAL ClientCertAuthRuleFactory(const DOMElement* const & e)
{
return new ClientCertAuthRule(e);
}
+
+ static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
};
+ClientCertAuthRule::ClientCertAuthRule(const DOMElement* e) : m_errorFatal(false)
+{
+ if (e) {
+ const XMLCh* flag = e->getAttributeNS(NULL, errorFatal);
+ m_errorFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ }
+}
+
void ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
{
Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.ClientCertAuth");
cc.setUsage(Credential::TLS_CREDENTIAL);
if (!x509trust->validate(chain.front(), chain, *(policy.getMetadataProvider()), &cc)) {
+ if (m_errorFatal)
+ throw SecurityPolicyException("Client certificate supplied, but could not be verified.");
log.error("unable to verify certificate chain with supplied trust engine");
return;
}
// Appends a raw parameter=value pair to the string.
static bool appendParameter(string& s, const char* data, const char* name);
- bool m_errorsFatal;
+ bool m_errorFatal;
};
SecurityPolicyRule* SAML_DLLLOCAL SimpleSigningRuleFactory(const DOMElement* const & e)
return new SimpleSigningRule(e);
}
- static const XMLCh errorsFatal[] = UNICODE_LITERAL_11(e,r,r,o,r,s,F,a,t,a,l);
+ static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
};
bool SimpleSigningRule::appendParameter(string& s, const char* data, const char* name)
return true;
}
-SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorsFatal(false)
+SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorFatal(false)
{
if (e) {
- const XMLCh* flag = e->getAttributeNS(NULL, errorsFatal);
- m_errorsFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ const XMLCh* flag = e->getAttributeNS(NULL, errorFatal);
+ m_errorFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
}
}
if (!sigtrust->validate(alg.get(), signature, keyInfo, input.c_str(), input.length(), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
- if (m_errorsFatal)
- throw SignatureException("Message was signed, but signature could not be verified.");
+ if (m_errorFatal)
+ throw SecurityPolicyException("Message was signed, but signature could not be verified.");
return;
}
void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
private:
- bool m_errorsFatal;
+ bool m_errorFatal;
};
SecurityPolicyRule* SAML_DLLLOCAL XMLSigningRuleFactory(const DOMElement* const & e)
return new XMLSigningRule(e);
}
- static const XMLCh errorsFatal[] = UNICODE_LITERAL_11(e,r,r,o,r,s,F,a,t,a,l);
+ static const XMLCh errorFatal[] = UNICODE_LITERAL_10(e,r,r,o,r,F,a,t,a,l);
};
-XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorsFatal(false)
+XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorFatal(false)
{
if (e) {
- const XMLCh* flag = e->getAttributeNS(NULL, errorsFatal);
- m_errorsFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
+ const XMLCh* flag = e->getAttributeNS(NULL, errorFatal);
+ m_errorFatal = (flag && (*flag==chLatin_t || *flag==chDigit_1));
}
}
}
catch (ValidationException& ve) {
log.error("signature profile failed to validate: %s", ve.what());
- if (m_errorsFatal)
+ if (m_errorFatal)
throw;
return;
}
if (!sigtrust->validate(*(signable->getSignature()), *(policy.getMetadataProvider()), &cc)) {
log.error("unable to verify message signature with supplied trust engine");
- if (m_errorsFatal)
- throw SignatureException("Message was signed, but signature could not be verified.");
+ if (m_errorFatal)
+ throw SecurityPolicyException("Message was signed, but signature could not be verified.");
return;
}