Moved key/cred resolution classes out of xmlsig namespace, start cleaning up configure.

[shibboleth/sp.git] / shibsp / ServiceProvider.h

diff --git a/shibsp/ServiceProvider.h b/shibsp/ServiceProvider.h
index e9ea103..45c76b3 100644 (file)
--- a/shibsp/ServiceProvider.h
+++ b/shibsp/ServiceProvider.h
@@ -24,12 +24,14 @@
 #define __shibsp_sp_h__
 
 #include <shibsp/util/PropertySet.h>
-#include <xmltooling/signature/CredentialResolver.h>
+#include <saml/binding/SecurityPolicyRule.h>
+#include <xmltooling/security/CredentialResolver.h>
 #include <xmltooling/util/StorageService.h>
 
 namespace shibsp {
 
     class SHIBSP_API Application;
+    class SHIBSP_API Handler;
     class SHIBSP_API ListenerService;
     class SHIBSP_API RequestMapper;
     class SHIBSP_API SessionCache;
@@ -43,7 +45,7 @@ namespace shibsp {
      * <p>A ServiceProvider exposes configuration and infrastructure services required
      * by the SP implementation, allowing a flexible configuration format.
      */
-    class SHIBSP_API ServiceProvider : public virtual xmltooling::Lockable, public virtual PropertySet
+       class SHIBSP_API ServiceProvider : public virtual xmltooling::Lockable, public virtual PropertySet
     {
         MAKE_NONCOPYABLE(ServiceProvider);
     protected:
@@ -97,7 +99,23 @@ namespace shibsp {
          * @param id    a NULL-terminated key identifying the CredentialResolver to the configuration 
          * @return  a CredentialResolver if available, or NULL
          */
-        virtual xmlsignature::CredentialResolver* getCredentialResolver(const char* id) const=0;
+        virtual xmltooling::CredentialResolver* getCredentialResolver(const char* id) const=0;
+
+        /**
+                * Returns the security policy settings for an identified policy.
+         *
+                * @param id    identifies the policy to return
+         * @return a PropertySet
+                */
+        virtual const PropertySet* getPolicySettings(const char* id) const=0;
+
+        /**
+                * Returns the security policy rules for an identified policy.
+         *
+                * @param id    identifies the policy to return
+         * @return an array of policy rules
+                */
+        virtual const std::vector<const opensaml::SecurityPolicyRule*>& getPolicyRules(const char* id) const=0;
 
         /**
          * Returns a RequestMapper instance.
@@ -107,8 +125,6 @@ namespace shibsp {
          */
         virtual RequestMapper* getRequestMapper(bool required=true) const=0;
         
-        //virtual ISessionCache* getSessionCache() const=0;
-        
         /**
          * Returns an Application instance matching the specified ID.
          *