X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fattribute%2Ffiltering%2FBasicFilteringContext.h;h=1136f34d1c1fe239b6bae66d8e1c6564d40719d4;hb=064c65878e2606f743d4434c6e9d2d6239a45bbd;hp=b05f555b22a3331a0b700bb4f0022ceeb4470331;hpb=d30673a03fe633dfb952bb6644657574f81a8ffa;p=shibboleth%2Fsp.git

diff --git a/shibsp/attribute/filtering/BasicFilteringContext.h b/shibsp/attribute/filtering/BasicFilteringContext.h
index b05f555..1136f34 100644
--- a/shibsp/attribute/filtering/BasicFilteringContext.h
+++ b/shibsp/attribute/filtering/BasicFilteringContext.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,11 @@
 
 namespace shibsp {
 
+    class SHIBSP_API Attribute;
+
+    /**
+     * A trivial FilteringContext implementation.
+     */
     class SHIBSP_API BasicFilteringContext : public FilteringContext
     {
     public:
@@ -41,49 +46,31 @@ namespace shibsp {
          */
         BasicFilteringContext(
             const Application& app,
-            const std::multimap<std::string,Attribute*>& attributes,
-            const opensaml::saml2md::RoleDescriptor* role=NULL,
-            const char* authncontext_class=NULL,
-            const char* authncontext_decl=NULL
-            ) : m_app(app), m_attributes(attributes), m_role(role), m_issuer(NULL), m_class(authncontext_class), m_decl(authncontext_decl) {
-            if (role)
-                m_issuer = dynamic_cast<opensaml::saml2md::EntityDescriptor*>(role->getParent())->getEntityID();
-        }
+            const std::vector<Attribute*>& attributes,
+            const opensaml::saml2md::RoleDescriptor* role=nullptr,
+            const XMLCh* authncontext_class=nullptr,
+            const XMLCh* authncontext_decl=nullptr
+            );
 
-        virtual ~BasicFilteringContext() {}
+        virtual ~BasicFilteringContext();
 
-        const Application& getApplication() const {
-            return m_app;
-        }
-        const char* getAuthnContextClassRef() const {
-            return m_class;
-        }
-        const char* getAuthnContextDeclRef() const {
-            return m_decl;
-        }
-        const XMLCh* getAttributeRequester() const {
-            return m_app.getXMLString("entityID").second;
-        }
-        const XMLCh* getAttributeIssuer() const {
-            return m_issuer;
-        }
-        const opensaml::saml2md::RoleDescriptor* getAttributeRequesterMetadata() const {
-            return NULL;
-        }
-        const opensaml::saml2md::RoleDescriptor* getAttributeIssuerMetadata() const {
-            return m_role;
-        }
-        const std::multimap<std::string,Attribute*>& getAttributes() const {
-            return m_attributes;
-        }
+        // Virtual function overrides.
+        const Application& getApplication() const;
+        const XMLCh* getAuthnContextClassRef() const;
+        const XMLCh* getAuthnContextDeclRef() const;
+        const XMLCh* getAttributeRequester() const;
+        const XMLCh* getAttributeIssuer() const;
+        const opensaml::saml2md::RoleDescriptor* getAttributeRequesterMetadata() const;
+        const opensaml::saml2md::RoleDescriptor* getAttributeIssuerMetadata() const;
+        const std::multimap<std::string,Attribute*>& getAttributes() const;
 
     private:
         const Application& m_app;
-        const std::multimap<std::string,Attribute*>& m_attributes;
+        std::multimap<std::string,Attribute*> m_attributes;
         const opensaml::saml2md::RoleDescriptor* m_role;
         const XMLCh* m_issuer;
-        const char* m_class;
-        const char* m_decl;
+        const XMLCh* m_class;
+        const XMLCh* m_decl;
     };
 };