Shorten "built-in" plugin types.

[shibboleth/cpp-opensaml.git] / saml / binding / SecurityPolicyRule.h

diff --git a/saml/binding/SecurityPolicyRule.h b/saml/binding/SecurityPolicyRule.h
index 68760f7..0f3090c 100644 (file)
--- a/saml/binding/SecurityPolicyRule.h
+++ b/saml/binding/SecurityPolicyRule.h
@@ -1,5 +1,5 @@
 /*
- *  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.
@@ -45,18 +45,13 @@ namespace opensaml {
         /**
          * Evaluates the rule against the given request and message.
          * 
-         * <p>Exceptions should be reserved for fatal request processing errors;
-         * otherwise rules should return false to indicate they were not applicable
-         * or unsuccessful.
-         * 
          * @param message   the incoming message
          * @param request   the protocol request
          * @param policy    SecurityPolicy to provide various components and track message data
-         * @return  true iff the rule ran successfully, false otherwise
-         * 
-         * @throws BindingException thrown if the request/message is invalid in some way
+         *
+         * @throws BindingException raised if the message/request is not acceptable to the policy rule
          */
-        virtual bool evaluate(
+        virtual void evaluate(
             const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy
             ) const=0;
     };
@@ -71,21 +66,21 @@ namespace opensaml {
      * 
      * Extracts message ID, timestamp, and issuer information.
      */
-    #define SAML1MESSAGE_POLICY_RULE  "org.opensaml.saml1.binding.SAML1MessageRule"
+    #define SAML1MESSAGE_POLICY_RULE  "SAML1Message"
 
     /**
      * SecurityPolicyRule for processing SAML 2.0 messages.
      * 
      * Extracts message ID, timestamp, and issuer information.
      */
-    #define SAML2MESSAGE_POLICY_RULE  "org.opensaml.saml2.binding.SAML2MessageRule"
+    #define SAML2MESSAGE_POLICY_RULE  "SAML2Message"
 
     /**
      * SecurityPolicyRule for TLS client certificate authentication.
      * 
      * Evaluates client certificates against the issuer's metadata.
      */
-    #define CLIENTCERTAUTH_POLICY_RULE  "org.opensaml.binding.ClientCertAuthRule"
+    #define CLIENTCERTAUTH_POLICY_RULE  "ClientCertAuth"
 
     /**
      * SecurityPolicyRule for replay detection and freshness checking.
@@ -98,7 +93,7 @@ namespace opensaml {
      * or up to a number of seconds set by an "expires" XML attribute when
      * instantiating the policy rule.
      */
-    #define MESSAGEFLOW_POLICY_RULE  "org.opensaml.binding.MessageFlowRule"
+    #define MESSAGEFLOW_POLICY_RULE  "MessageFlow"
 
     /**
      * SecurityPolicyRule for protocol message "blob" signing.
@@ -106,7 +101,7 @@ namespace opensaml {
      * Allows the message issuer to be authenticated using a non-XML digital signature
      * over the message body. The transport layer is not considered.
      */
-    #define SIMPLESIGNING_POLICY_RULE  "org.opensaml.binding.SimpleSigningRule"
+    #define SIMPLESIGNING_POLICY_RULE  "SimpleSigning"
 
     /**
      * SecurityPolicyRule for protocol message XML signing.
@@ -114,7 +109,7 @@ namespace opensaml {
      * Allows the message issuer to be authenticated using an XML digital signature
      * over the message. The transport layer is not considered.
      */
-    #define XMLSIGNING_POLICY_RULE  "org.opensaml.binding.XMLSigningRule"
+    #define XMLSIGNING_POLICY_RULE  "XMLSigning"
 };
 
 #endif /* __saml_secrule_h__ */