-/*
- * 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.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
#include <saml/saml2/metadata/ObservableMetadataProvider.h>
-#include <xmltooling/security/Credential.h>
-#include <xmltooling/security/CredentialCriteria.h>
-#include <xmltooling/util/Threads.h>
+#include <ctime>
+#include <map>
+#include <vector>
+#include <string>
+
+namespace xmltooling {
+ class XMLTOOL_API Credential;
+ class XMLTOOL_API CredentialCriteria;
+ class XMLTOOL_API KeyInfoResolver;
+ class XMLTOOL_API Mutex;
+};
namespace opensaml {
namespace saml2md {
class SAML_API MetadataFilter;
+#if defined (_MSC_VER)
+ #pragma warning( push )
+ #pragma warning( disable : 4251 )
+#endif
+
/**
* Base class for caching metadata providers.
*/
*
* @param e DOM to supply configuration for provider
*/
- AbstractMetadataProvider(const DOMElement* e=NULL);
+ AbstractMetadataProvider(const xercesc::DOMElement* e=nullptr);
public:
virtual ~AbstractMetadataProvider();
- void emitChangeEvent();
- const EntityDescriptor* getEntityDescriptor(const char* id, bool requireValidMetadata=true) const;
- const EntityDescriptor* getEntityDescriptor(const SAMLArtifact* artifact) const;
+ using MetadataProvider::getEntityDescriptor;
+ using MetadataProvider::getEntitiesDescriptor;
+
+ void outputStatus(std::ostream& os) const;
+ void emitChangeEvent() const;
+ std::pair<const EntityDescriptor*,const RoleDescriptor*> getEntityDescriptor(const Criteria& criteria) const;
const EntitiesDescriptor* getEntitiesDescriptor(const char* name, bool requireValidMetadata=true) const;
- const xmltooling::Credential* resolve(const xmltooling::CredentialCriteria* criteria=NULL) const;
+ const xmltooling::Credential* resolve(const xmltooling::CredentialCriteria* criteria=nullptr) const;
std::vector<const xmltooling::Credential*>::size_type resolve(
- std::vector<const xmltooling::Credential*>& results, const xmltooling::CredentialCriteria* criteria=NULL
+ std::vector<const xmltooling::Credential*>& results, const xmltooling::CredentialCriteria* criteria=nullptr
) const;
protected:
+ /** Time of last update for reporting. */
+ mutable time_t m_lastUpdate;
+
/** Embedded KeyInfoResolver instance. */
xmltooling::KeyInfoResolver* m_resolver;
/**
- * Loads an entity into the cache for faster lookup. This includes
- * processing known reverse lookup strategies for artifacts.
+ * Loads an entity into the cache for faster lookup.
+ * <p>This includes processing known reverse lookup strategies for artifacts.
+ * The validUntil parameter will contain the smallest value found on output.
*
* @param site entity definition
- * @param validUntil expiration time of the entity definition
+ * @param validUntil maximum expiration time of the entity definition
+ * @param replace true iff existing entries for the same entity should be cleared/replaced
*/
- virtual void index(EntityDescriptor* site, time_t validUntil);
+ virtual void indexEntity(EntityDescriptor* site, time_t& validUntil, bool replace=false) const;
/**
* Loads a group of entities into the cache for faster lookup.
+ * <p>The validUntil parameter will contain the smallest value found on output.
*
* @param group group definition
- * @param validUntil expiration time of the group definition
+ * @param validUntil maximum expiration time of the group definition
*/
- virtual void index(EntitiesDescriptor* group, time_t validUntil);
-
+ virtual void indexGroup(EntitiesDescriptor* group, time_t& validUntil) const;
+
/**
- * Clear the cache of known entities and groups.
+ * @deprecated
+ * Loads an entity into the cache for faster lookup.
+ * <p>This includes processing known reverse lookup strategies for artifacts.
+ *
+ * @param site entity definition
+ * @param validUntil maximum expiration time of the entity definition
+ * @param replace true iff existing entries for the same entity should be cleared/replaced
+ */
+ virtual void index(EntityDescriptor* site, time_t validUntil, bool replace=false) const;
+
+ /**
+ * @deprecated
+ * Loads a group of entities into the cache for faster lookup.
+ *
+ * @param group group definition
+ * @param validUntil maximum expiration time of the group definition
*/
- virtual void clearDescriptorIndex();
+ virtual void index(EntitiesDescriptor* group, time_t validUntil) const;
/**
- * Returns true iff the Credential matches the criteria supplied, if any.
+ * Clear the cache of known entities and groups.
*
- * @param cred Credential plus KeyDescriptor usage information
- * @param criteria criteria for Credential selection
- * @return true iff the Credential applies
+ * @param freeSites true iff the objects cached in the site map should be freed.
*/
- virtual bool matches(
- const std::pair<const XMLCh*,xmltooling::Credential*>& cred, const xmltooling::CredentialCriteria* criteria
- ) const;
-
+ virtual void clearDescriptorIndex(bool freeSites=false);
+
private:
typedef std::multimap<std::string,const EntityDescriptor*> sitemap_t;
typedef std::multimap<std::string,const EntitiesDescriptor*> groupmap_t;
- sitemap_t m_sites;
- sitemap_t m_sources;
- groupmap_t m_groups;
+ mutable sitemap_t m_sites;
+ mutable sitemap_t m_sources;
+ mutable groupmap_t m_groups;
- mutable xmltooling::Mutex* m_credentialLock;
- typedef std::map<const RoleDescriptor*, std::vector< std::pair<const XMLCh*,xmltooling::Credential*> > > credmap_t;
+ std::auto_ptr<xmltooling::KeyInfoResolver> m_resolverWrapper;
+ std::auto_ptr<xmltooling::Mutex> m_credentialLock;
+ typedef std::map< const RoleDescriptor*, std::vector<xmltooling::Credential*> > credmap_t;
mutable credmap_t m_credentialMap;
const credmap_t::mapped_type& resolveCredentials(const RoleDescriptor& role) const;
};
+
+#if defined (_MSC_VER)
+ #pragma warning( pop )
+ #pragma warning( disable : 4251 )
+#endif
};
};
projects / shibboleth / cpp-opensaml.git / blobdiff