X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fbinding%2FSecurityPolicy.h;h=7f879ecf23d8f4396e32092feeb4e99e20ee1647;hp=8d680d1fe4250565fc3832868e4f793a1701b76e;hb=003e73203da5cdf8c3d001a75a56b9e45ef6465b;hpb=6b5c75d27994ca1f9d450a81576a1bde4873edf3 diff --git a/saml/binding/SecurityPolicy.h b/saml/binding/SecurityPolicy.h index 8d680d1..7f879ec 100644 --- a/saml/binding/SecurityPolicy.h +++ b/saml/binding/SecurityPolicy.h @@ -1,6 +1,6 @@ /* - * 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. * You may obtain a copy of the License at @@ -16,18 +16,18 @@ /** * @file saml/binding/SecurityPolicy.h - * + * * Overall policy used to verify the security of an incoming message. */ #ifndef __saml_secpol_h__ #define __saml_secpol_h__ -#include +#include #include #include -#include +#include #include #if defined (_MSC_VER) @@ -40,22 +40,18 @@ namespace opensaml { namespace saml2 { class SAML_API Issuer; }; - namespace saml2md { - class SAML_API MetadataProvider; - class SAML_API RoleDescriptor; - }; - + class SAML_API SecurityPolicyRule; - + /** * A policy used to verify the security of an incoming message. - * + * *

Its security mechanisms may be used to examine the transport layer * (e.g client certificates and HTTP basic auth passwords) or to check the * payload of a request to ensure it meets certain criteria (e.g. valid * digital signature, freshness, replay). - * - *

Policy objects can be reused, but are not thread-safe. + * + *

Policy objects can be reused, but are not thread-safe. */ class SAML_API SecurityPolicy { @@ -63,37 +59,19 @@ namespace opensaml { public: /** * Constructor for policy. - * - * @param metadataProvider locked MetadataProvider instance - * @param role identifies the role (generally IdP or SP) of the policy peer - * @param trustEngine TrustEngine to authenticate policy peer - */ - SecurityPolicy( - const saml2md::MetadataProvider* metadataProvider=NULL, - const xmltooling::QName* role=NULL, - const xmltooling::TrustEngine* trustEngine=NULL - ) : m_messageQName(NULL), m_messageID(NULL), m_issueInstant(0), m_issuer(NULL), m_issuerRole(NULL), m_secure(false), - m_matchingPolicy(NULL), m_metadata(metadataProvider), m_role(NULL), m_trust(trustEngine) { - if (role) - m_role = new xmltooling::QName(*role); - } - - /** - * Constructor for policy using existing rules. The lifetime of the policy rules - * must be at least as long as the policy object. * - * @param rules reference to array of policy rules to use * @param metadataProvider locked MetadataProvider instance - * @param role identifies the role (generally IdP or SP) of the policy peer + * @param role identifies the role (generally IdP or SP) of the policy peer * @param trustEngine TrustEngine to authenticate policy peer + * @param validate true iff XML parsing should be done with validation */ SecurityPolicy( - const std::vector& rules, const saml2md::MetadataProvider* metadataProvider=NULL, const xmltooling::QName* role=NULL, - const xmltooling::TrustEngine* trustEngine=NULL - ) : m_messageQName(NULL), m_messageID(NULL), m_issueInstant(0), m_issuer(NULL), m_issuerRole(NULL), m_secure(false), - m_matchingPolicy(NULL), m_rules(rules), m_metadata(metadataProvider), m_role(NULL), m_trust(trustEngine) { + const xmltooling::TrustEngine* trustEngine=NULL, + bool validate=true + ) : m_metadataCriteria(NULL), m_messageID(NULL), m_issueInstant(0), m_issuer(NULL), m_issuerRole(NULL), m_authenticated(false), + m_matchingPolicy(NULL), m_metadata(metadataProvider), m_role(NULL), m_trust(trustEngine), m_validate(validate), m_entityOnly(true) { if (role) m_role = new xmltooling::QName(*role); } @@ -102,7 +80,7 @@ namespace opensaml { /** * Returns the locked MetadataProvider supplied to the policy. - * + * * @return the supplied MetadataProvider or NULL */ const saml2md::MetadataProvider* getMetadataProvider() const { @@ -110,8 +88,16 @@ namespace opensaml { } /** + * Returns a reference to a MetadataProvider::Criteria instance suitable for use with the + * installed MetadataProvider. + * + * @return reference to a MetadataProvider::Criteria instance + */ + virtual saml2md::MetadataProvider::Criteria& getMetadataProviderCriteria() const; + + /** * Returns the peer role element/type supplied to the policy. - * + * * @return the peer role element/type, or an empty QName */ const xmltooling::QName* getRole() const { @@ -120,7 +106,7 @@ namespace opensaml { /** * Returns the TrustEngine supplied to the policy. - * + * * @return the supplied TrustEngine or NULL */ const xmltooling::TrustEngine* getTrustEngine() const { @@ -128,18 +114,37 @@ namespace opensaml { } /** - * Adds a SecurityPolicyRule to the policy. The lifetime of the policy rule - * must be at least as long as the policy object. - * - * @param rule SecurityPolicyRule to add + * Returns XML message validation setting. + * + * @return validation flag + */ + bool getValidating() const { + return m_validate; + } + + /** + * Returns flag controlling non-entity issuer support. + * + * @return flag controlling non-entity issuer support + */ + bool requireEntityIssuer() const { + return m_entityOnly; + } + + /** + * Gets a mutable array of installed policy rules. + * + *

If adding rules, their lifetime must be at least as long as the policy object. + * + * @return mutable array of rules */ - void addRule(const SecurityPolicyRule* rule) { - m_rules.push_back(rule); + std::vector& getRules() { + return m_rules; } /** * Sets a locked MetadataProvider for the policy. - * + * * @param metadata a locked MetadataProvider or NULL */ void setMetadataProvider(const saml2md::MetadataProvider* metadata) { @@ -148,7 +153,7 @@ namespace opensaml { /** * Sets a peer role element/type for to the policy. - * + * * @param role the peer role element/type or NULL */ void setRole(const xmltooling::QName* role) { @@ -158,7 +163,7 @@ namespace opensaml { /** * Sets a TrustEngine for the policy. - * + * * @param trust a TrustEngine or NULL */ void setTrustEngine(const xmltooling::TrustEngine* trust) { @@ -166,33 +171,51 @@ namespace opensaml { } /** + * Controls schema validation of incoming XML messages. + * This is separate from other forms of programmatic validation of objects, + * but can detect a much wider range of syntax errors. + * + * @param validate validation setting + */ + void setValidating(bool validate=true) { + m_validate = validate; + } + + /** + * Sets flag controlling non-entity issuer support. + * + * @param entityOnly require that Issuer be in entity format + */ + void requireEntityIssuer(bool entityOnly=true) { + m_entityOnly = entityOnly; + } + + /** * Evaluates the policy against the given request and message, * possibly populating message information in the policy object. - * + * * @param message the incoming message * @param request the protocol request * * @throws BindingException raised if the message/request is invalid according to the supplied rules */ - void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request=NULL); + void evaluate( + const xmltooling::XMLObject& message, const xmltooling::GenericRequest* request=NULL + ); /** - * Resets the policy object and clears any per-message state. - */ - void reset(); - - /** - * Returns the message element/type as determined by the registered policies. - * - * @return message element/type as determined by the registered policies + * Resets the policy object and/or clears any per-message state. + * + *

Resets can be complete (the default) or merely clear the previous message ID and timestamp + * when evaluating multiple layers of a message. + * + * @param messageOnly true iff security and issuer state should be left in place */ - const xmltooling::QName* getMessageQName() const { - return m_messageQName; - } + void reset(bool messageOnly=false); /** * Returns the message identifier as determined by the registered policies. - * + * * @return message identifier as determined by the registered policies */ const XMLCh* getMessageID() const { @@ -201,7 +224,7 @@ namespace opensaml { /** * Returns the message timestamp as determined by the registered policies. - * + * * @return message timestamp as determined by the registered policies */ time_t getIssueInstant() const { @@ -210,7 +233,7 @@ namespace opensaml { /** * Gets the issuer of the message as determined by the registered policies. - * + * * @return issuer of the message as determined by the registered policies */ const saml2::Issuer* getIssuer() const { @@ -219,7 +242,7 @@ namespace opensaml { /** * Gets the metadata for the role the issuer is operating in. - * + * * @return metadata for the role the issuer is operating in */ const saml2md::RoleDescriptor* getIssuerMetadata() const { @@ -227,37 +250,27 @@ namespace opensaml { } /** - * Returns the security status as determined by the registered policies. - * - * @return true iff a SecurityPolicyRule has indicated the issuer/message has been authenticated - */ - bool isSecure() const { - return m_secure; - } - - /** - * Sets the message element/type as determined by the registered policies. - * - * @param messageQName message element/type + * Returns the authentication status of the message as determined by the registered policies. + * + * @return true iff a SecurityPolicyRule has indicated the issuer/message has been authenticated */ - void setMessageQName(const xmltooling::QName* messageQName) { - delete m_messageQName; - m_messageQName = messageQName ? new xmltooling::QName(*messageQName) : NULL; + bool isAuthenticated() const { + return m_authenticated; } /** * Sets the message identifier as determined by the registered policies. - * + * * @param id message identifier */ void setMessageID(const XMLCh* id) { - XMLString::release(&m_messageID); - m_messageID = XMLString::replicate(id); + xercesc::XMLString::release(&m_messageID); + m_messageID = xercesc::XMLString::replicate(id); } /** * Sets the message timestamp as determined by the registered policies. - * + * * @param issueInstant message timestamp */ void setIssueInstant(time_t issueInstant) { @@ -266,52 +279,71 @@ namespace opensaml { /** * Sets the issuer of the message as determined by the registered policies. - * The policy object takes ownership of the Issuer object. - * + * * @param issuer issuer of the message */ - void setIssuer(saml2::Issuer* issuer); - + void setIssuer(const saml2::Issuer* issuer); + + /** + * Sets the issuer of the message as determined by the registered policies. + * + * @param issuer issuer of the message + */ + void setIssuer(const XMLCh* issuer); + /** * Sets the metadata for the role the issuer is operating in. - * + * * @param issuerRole metadata for the role the issuer is operating in */ void setIssuerMetadata(const saml2md::RoleDescriptor* issuerRole); /** - * Sets the security status as determined by the registered policies. - * - * @param secure indicates whether the issuer/message has been authenticated + * Sets the authentication status of the message as determined by the registered policies. + * + * @param auth indicates whether the issuer/message has been authenticated */ - void setSecure(bool secure) { - m_secure = secure; + void setAuthenticated(bool auth) { + m_authenticated = auth; } - + /** Allows override of rules for comparing saml2:Issuer information. */ class SAML_API IssuerMatchingPolicy { MAKE_NONCOPYABLE(IssuerMatchingPolicy); public: IssuerMatchingPolicy() {} virtual ~IssuerMatchingPolicy() {} - + /** * Returns true iff the two operands "match". Applications can override this method to - * support non-standard issuer matching for complex policies. - * + * support non-standard issuer matching for complex policies. + * *

The default implementation does a basic comparison of the XML content, treating * an unsupplied Format as an "entityID". - * + * * @param issuer1 the first Issuer to match * @param issuer2 the second Issuer to match * @return true iff the operands match */ virtual bool issuerMatches(const saml2::Issuer* issuer1, const saml2::Issuer* issuer2) const; + + /** + * Returns true iff the two operands "match". Applications can override this method to + * support non-standard issuer matching for complex policies. + * + *

The default implementation does a basic comparison of the XML content, treating + * an unsupplied Format as an "entityID". + * + * @param issuer1 the first Issuer to match + * @param issuer2 the second Issuer to match + * @return true iff the operands match + */ + virtual bool issuerMatches(const saml2::Issuer* issuer1, const XMLCh* issuer2) const; }; /** * Returns the IssuerMatchingPolicy in effect. - * + * * @return the effective IssuerMatchingPolicy */ const IssuerMatchingPolicy& getIssuerMatchingPolicy() const { @@ -321,9 +353,9 @@ namespace opensaml { /** * Sets the IssuerMatchingPolicy in effect. Setting no policy will * cause the simple, default approach to be used. - * + * *

The matching object will be freed by the SecurityPolicy. - * + * * @param matchingPolicy the IssuerMatchingPolicy to use */ void setIssuerMatchingPolicy(IssuerMatchingPolicy* matchingPolicy) { @@ -335,21 +367,25 @@ namespace opensaml { /** A shared matching object that just supports the default matching rules. */ static IssuerMatchingPolicy m_defaultMatching; + /** Manufactured MetadataProvider::Criteria instance. */ + mutable saml2md::MetadataProvider::Criteria* m_metadataCriteria; + private: - // information extracted from message - xmltooling::QName* m_messageQName; + // information extracted from message XMLCh* m_messageID; time_t m_issueInstant; saml2::Issuer* m_issuer; const saml2md::RoleDescriptor* m_issuerRole; - bool m_secure; - + bool m_authenticated; + // components governing policy rules IssuerMatchingPolicy* m_matchingPolicy; std::vector m_rules; const saml2md::MetadataProvider* m_metadata; xmltooling::QName* m_role; const xmltooling::TrustEngine* m_trust; + bool m_validate; + bool m_entityOnly; }; };