A "simple" attribute resolver, and token validation.

[shibboleth/cpp-sp.git] / shibsp / SPConfig.h

diff --git a/shibsp/SPConfig.h b/shibsp/SPConfig.h
index 47f5e70..c785e87 100644 (file)
--- a/shibsp/SPConfig.h
+++ b/shibsp/SPConfig.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.
@@ -34,10 +34,13 @@
 namespace shibsp {
 
     class SHIBSP_API AccessControl;
+    class SHIBSP_API AttributeDecoder;
+    class SHIBSP_API AttributeResolver;
     class SHIBSP_API Handler;
     class SHIBSP_API ListenerService;
     class SHIBSP_API RequestMapper;
     class SHIBSP_API ServiceProvider;
+    class SHIBSP_API SessionCache;
 
 #if defined (_MSC_VER)
     #pragma warning( push )
@@ -69,7 +72,7 @@ namespace shibsp {
             Metadata = 4,
             Trust = 8,
             Credentials = 16,
-            AAP = 32,
+            AttributeResolution = 32,
             RequestMapping = 64,
             OutOfProcess = 128,
             InProcess = 256,
@@ -132,12 +135,25 @@ namespace shibsp {
             return m_serviceProvider;
         }
 
+        /** Separator for serialized values of multi-valued attributes. */
+        char attribute_value_delimeter;
+        
         /**
          * Manages factories for AccessControl plugins.
          */
         xmltooling::PluginManager<AccessControl,const xercesc::DOMElement*> AccessControlManager;
 
         /**
+         * Manages factories for AttributeDecoder plugins.
+         */
+        xmltooling::PluginManager<AttributeDecoder,const xercesc::DOMElement*> AttributeDecoderManager;
+
+        /**
+         * Manages factories for AttributeResolver plugins.
+         */
+        xmltooling::PluginManager<AttributeResolver,const xercesc::DOMElement*> AttributeResolverManager;
+
+        /**
          * Manages factories for Handler plugins that implement AssertionConsumerService functionality.
          */
         xmltooling::PluginManager<Handler,const xercesc::DOMElement*> AssertionConsumerServiceManager;
@@ -168,6 +184,11 @@ namespace shibsp {
         xmltooling::PluginManager<ServiceProvider,const xercesc::DOMElement*> ServiceProviderManager;
 
         /**
+         * Manages factories for SessionCache plugins.
+         */
+        xmltooling::PluginManager<SessionCache,const xercesc::DOMElement*> SessionCacheManager;
+
+        /**
          * Manages factories for Handler plugins that implement SessionInitiator functionality.
          */
         xmltooling::PluginManager<Handler,const xercesc::DOMElement*> SessionInitiatorManager;
@@ -178,7 +199,7 @@ namespace shibsp {
         xmltooling::PluginManager<Handler,const xercesc::DOMElement*> SingleLogoutServiceManager;
 
     protected:
-        SPConfig() : m_serviceProvider(NULL) {}
+        SPConfig() : attribute_value_delimeter(';'), m_serviceProvider(NULL), m_features(0) {}
         
         /** Global ServiceProvider instance. */
         ServiceProvider* m_serviceProvider;