Set fourth file version digit to signify rebuild.

[shibboleth/cpp-opensaml.git] / saml / saml2 / profile / BrowserSSOProfileValidator.h

diff --git a/saml/saml2/profile/BrowserSSOProfileValidator.h b/saml/saml2/profile/BrowserSSOProfileValidator.h
index 1a8a0c3..d075327 100644 (file)
--- a/saml/saml2/profile/BrowserSSOProfileValidator.h
+++ b/saml/saml2/profile/BrowserSSOProfileValidator.h
@@ -1,23 +1,27 @@
-/*
- *  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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * @file saml/saml2/profile/BrowserSSOProfileValidator.h
- * 
- * SAML 2.0 Browser SSO Profile Assertion Validator 
+ *
+ * SAML 2.0 Browser SSO Profile Assertion Validator.
  */
 
 #ifndef __saml2_ssoval_h__
@@ -25,37 +29,45 @@
 
 #include <saml/saml2/profile/AssertionValidator.h>
 
+#include <xmltooling/unicode.h>
+
 namespace opensaml {
-    
     namespace saml2 {
-        
+
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4251 )
+#endif
+
         /**
+         * @deprecated
          * SAML 2.0 Browser SSO Profile Assertion Validator
          *
          * <p>In addition to standard core requirements for validity, SSO assertions
-         * <strong>MUST</strong> have NotBefore/NotOnOrAfter attributes and each subject statement
-         * <strong>MUST</strong> be confirmable via bearer method.
+         * <strong>MUST</strong> be bearer-confirmable.
          */
         class SAML_API BrowserSSOProfileValidator : public AssertionValidator
         {
         public:
             /**
              * Constructor
-             * 
-             * @param audiences     set of audience values representing recipient
+             *
+             * @param recipient     name of assertion recipient (implicit audience)
+             * @param audiences     additional audience values
              * @param ts            timestamp to evaluate assertion conditions, or 0 to bypass check
              * @param destination   server location to which assertion was delivered, or 0 to bypass check
-             * @param requestID     ID of request that resulted in assertion, or NULL if unsolicited
+             * @param requestID     ID of request that resulted in assertion, or nullptr if unsolicited
              */
             BrowserSSOProfileValidator(
-                const std::vector<const XMLCh*>& audiences,
+                const XMLCh* recipient,
+                const std::vector<const XMLCh*>* audiences=nullptr,
                 time_t ts=0,
-                const XMLCh* destination=NULL,
-                const XMLCh* requestID=NULL
-                ) : AssertionValidator(audiences, ts), m_destination(destination), m_requestID(requestID) {
-            }
-            virtual ~BrowserSSOProfileValidator() {}
-    
+                const char* destination=nullptr,
+                const char* requestID=nullptr
+                );
+
+            virtual ~BrowserSSOProfileValidator();
+
             void validateAssertion(const Assertion& assertion) const;
 
             /**
@@ -63,22 +75,24 @@ namespace opensaml {
              *
              * @return  address information
              */
-            const char* getAddress() const {
-                return m_address.c_str();
-            }
-        
+            const char* getAddress() const;
+
         protected:
             /** Server location to which assertion was delivered. */
-            const XMLCh* m_destination;
+            xmltooling::auto_ptr_XMLCh m_destination;
 
             /** ID of request that resulted in assertions. */
-            const XMLCh* m_requestID;
+            xmltooling::auto_ptr_XMLCh m_requestID;
 
         private:
             /** Address in confirmed bearer SubjectConfirmationData. */
             mutable std::string m_address;
         };
-        
+
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif
+
     };
 };