Remove xmlproviders from build, deleted old AAP interface.

[shibboleth/cpp-sp.git] / shib / shib.h

diff --git a/shib/shib.h b/shib/shib.h
index 5a917b4..cdcfeb4 100644 (file)
--- a/shib/shib.h
+++ b/shib/shib.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 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.
@@ -28,7 +28,6 @@
 #include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
 #include <xmltooling/security/TrustEngine.h>
-#include <xmltooling/util/Threads.h>
 
 #include <saml/saml.h>
 #undef SAML10_PROTOCOL_ENUM
@@ -43,95 +42,12 @@
 
 namespace shibboleth
 {
-    // Credentials interface abstracts access to "owned" keys and certificates.
-    
-    struct SHIB_EXPORTS ICredResolver : public virtual saml::IPlugIn
-    {
-        virtual void attach(void* ctx) const=0;
-        virtual XSECCryptoKey* getKey() const=0;
-        virtual saml::Iterator<XSECCryptoX509*> getCertificates() const=0;
-        virtual void dump(FILE* f) const=0;
-        virtual void dump() const { dump(stdout); }
-        virtual ~ICredResolver() {}
-    };
-
-    struct SHIB_EXPORTS ICredentials : public virtual saml::ILockable, public virtual saml::IPlugIn
-    {
-        virtual const ICredResolver* lookup(const char* id) const=0;
-        virtual ~ICredentials() {}
-    };
-    
-    // Attribute acceptance processing interfaces, applied to incoming attributes.
-
-    struct SHIB_EXPORTS IAttributeRule
-    {
-        virtual const XMLCh* getName() const=0;
-        virtual const XMLCh* getNamespace() const=0;
-        virtual const char* getAlias() const=0;
-        virtual const char* getHeader() const=0;
-        virtual bool getCaseSensitive() const=0;
-        virtual void apply(saml::SAMLAttribute& attribute, const opensaml::saml2md::RoleDescriptor* role=NULL) const=0;
-        virtual ~IAttributeRule() {}
-    };
-    
-    struct SHIB_EXPORTS IAAP : public virtual saml::ILockable, public virtual saml::IPlugIn
-    {
-        virtual bool anyAttribute() const=0;
-        virtual const IAttributeRule* lookup(const XMLCh* attrName, const XMLCh* attrNamespace=NULL) const=0;
-        virtual const IAttributeRule* lookup(const char* alias) const=0;
-        virtual saml::Iterator<const IAttributeRule*> getAttributeRules() const=0;
-        virtual ~IAAP() {}
-    };
-    
     struct SHIB_EXPORTS IAttributeFactory : public virtual saml::IPlugIn
     {
         virtual saml::SAMLAttribute* build(DOMElement* e) const=0;
         virtual ~IAttributeFactory() {}
     };
 
-#ifdef SHIB_INSTANTIATE
-    template class SHIB_EXPORTS saml::Iterator<ICredentials*>;
-    template class SHIB_EXPORTS saml::ArrayIterator<ICredentials*>;
-    template class SHIB_EXPORTS saml::Iterator<IAAP*>;
-    template class SHIB_EXPORTS saml::ArrayIterator<IAAP*>;
-#endif
-
-    class SHIB_EXPORTS Credentials
-    {
-    public:
-        Credentials(const saml::Iterator<ICredentials*>& creds) : m_creds(creds), m_mapper(NULL) {}
-        ~Credentials();
-
-        const ICredResolver* lookup(const char* id);
-
-    private:
-        Credentials(const Credentials&);
-        void operator=(const Credentials&);
-        ICredentials* m_mapper;
-        saml::Iterator<ICredentials*> m_creds;
-    };
-
-    class SHIB_EXPORTS AAP
-    {
-    public:
-        AAP(const saml::Iterator<IAAP*>& aaps, const XMLCh* attrName, const XMLCh* attrNamespace=NULL);
-        AAP(const saml::Iterator<IAAP*>& aaps, const char* alias);
-        ~AAP();
-        bool fail() const {return m_mapper==NULL;}
-        const IAttributeRule* operator->() const {return m_rule;}
-        operator const IAttributeRule*() const {return m_rule;}
-        
-        static void apply(
-            const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertion, const opensaml::saml2md::RoleDescriptor* role=NULL
-            );
-        
-    private:
-        AAP(const AAP&);
-        void operator=(const AAP&);
-        IAAP* m_mapper;
-        const IAttributeRule* m_rule;
-    };
-
     // Subclass around the OpenSAML browser profile interface,
     // incoporates additional functionality using Shib-defined APIs.
     class SHIB_EXPORTS ShibBrowserProfile : virtual public saml::SAMLBrowserProfile
@@ -195,47 +111,6 @@ namespace shibboleth
         // enables runtime and clients to access configuration
         static ShibConfig& getConfig();
     };
-
-    /* Helper classes for implementing reloadable XML-based config files
-       The ILockable interface will usually be inherited twice, once as
-       part of the external interface to clients and once as an implementation
-       detail of the reloading class below.
-     */
-    
-    class SHIB_EXPORTS ReloadableXMLFileImpl
-    {
-    public:
-        ReloadableXMLFileImpl(const char* pathname);
-        ReloadableXMLFileImpl(const DOMElement* pathname);
-        virtual ~ReloadableXMLFileImpl();
-        
-    protected:
-        DOMDocument* m_doc;
-        const DOMElement* m_root;
-    };
-
-    class SHIB_EXPORTS ReloadableXMLFile : protected virtual saml::ILockable
-    {
-    public:
-        ReloadableXMLFile(const DOMElement* e);
-        ~ReloadableXMLFile() { delete m_lock; delete m_impl; }
-
-        virtual void lock();
-        virtual void unlock() { if (m_lock) m_lock->unlock(); }
-
-        ReloadableXMLFileImpl* getImplementation() const;
-
-    protected:
-        virtual ReloadableXMLFileImpl* newImplementation(const char* pathname, bool first=true) const=0;
-        virtual ReloadableXMLFileImpl* newImplementation(const DOMElement* e, bool first=true) const=0;
-        mutable ReloadableXMLFileImpl* m_impl;
-        
-    private:
-        const DOMElement* m_root;
-        std::string m_source;
-        time_t m_filestamp;
-        xmltooling::RWLock* m_lock;
-    };
 }
 
 #endif