A "simple" attribute resolver, and token validation.

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

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index d92bdca..cefcc17 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -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.
@@ -22,11 +22,18 @@
  */
 
 #include "internal.h"
+#include "AccessControl.h"
 #include "exceptions.h"
-#include "ListenerService.h"
-#include "MetadataExt.h"
-#include "PKIXTrustEngine.h"
+#include "Handler.h"
+#include "RequestMapper.h"
+#include "ServiceProvider.h"
+#include "SessionCache.h"
 #include "SPConfig.h"
+#include "attribute/AttributeDecoder.h"
+#include "attribute/resolver/AttributeResolver.h"
+#include "metadata/MetadataExt.h"
+#include "remoting/ListenerService.h"
+#include "security/PKIXTrustEngine.h"
 
 #include <log4cpp/Category.hh>
 #include <saml/SAMLConfig.h>
@@ -38,6 +45,8 @@ using namespace opensaml;
 using namespace xmltooling;
 using namespace log4cpp;
 
+DECL_XMLTOOLING_EXCEPTION_FACTORY(AttributeException,shibsp);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(AttributeResolutionException,shibsp);
 DECL_XMLTOOLING_EXCEPTION_FACTORY(ConfigurationException,shibsp);
 DECL_XMLTOOLING_EXCEPTION_FACTORY(ListenerException,shibsp);
 
@@ -57,7 +66,7 @@ SPInternalConfig& SPInternalConfig::getInternalConfig()
 
 void SPConfig::setServiceProvider(ServiceProvider* serviceProvider)
 {
-    //delete m_serviceProvider;
+    delete m_serviceProvider;
     m_serviceProvider = serviceProvider;
 }
 
@@ -88,13 +97,23 @@ bool SPInternalConfig::init(const char* catalog_path)
     XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
     XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp");
     
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(AttributeException,shibsp);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(AttributeResolutionException,shibsp);
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ConfigurationException,shibsp);
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ListenerException,shibsp);
     
-    registerListenerServices();
     registerMetadataExtClasses();
     registerPKIXTrustEngine();
 
+    registerAccessControls();
+    registerAttributeDecoders();
+    registerAttributeFactories();
+    registerAttributeResolvers();
+    registerListenerServices();
+    registerRequestMappers();
+    registerSessionCaches();
+    registerServiceProviders();
+    
     log.info("library initialization complete");
     return true;
 }
@@ -107,10 +126,23 @@ void SPInternalConfig::term()
     Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
     log.info("shutting down the library");
 
-    //delete m_serviceProvider;
+    delete m_serviceProvider;
     m_serviceProvider = NULL;
+
+    AssertionConsumerServiceManager.deregisterFactories();
+    ManageNameIDServiceManager.deregisterFactories();
+    SessionInitiatorManager.deregisterFactories();
+    SingleLogoutServiceManager.deregisterFactories();
     
+    ServiceProviderManager.deregisterFactories();
+    SessionCacheManager.deregisterFactories();
+    RequestMapperManager.deregisterFactories();
     ListenerServiceManager.deregisterFactories();
+    HandlerManager.deregisterFactories();
+    AttributeResolverManager.deregisterFactories();
+    AttributeDecoderManager.deregisterFactories();
+    Attribute::deregisterFactories();
+    AccessControlManager.deregisterFactories();
 
     SAMLConfig::getConfig().term();
     log.info("library shutdown complete");