boost changes and header fixes

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / DynamicMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
index cd476b9..238aab0 100644 (file)
--- a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2010 Internet2
+/**
+ * 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.
  *
- * 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
+ * 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.
  */
 
 /**
@@ -43,6 +47,7 @@ using namespace std;
 #  define min(a,b)            (((a) < (b)) ? (a) : (b))
 # endif
 
+static const XMLCh id[] =                   UNICODE_LITERAL_2(i,d);
 static const XMLCh maxCacheDuration[] =     UNICODE_LITERAL_16(m,a,x,C,a,c,h,e,D,u,r,a,t,i,o,n);
 static const XMLCh minCacheDuration[] =     UNICODE_LITERAL_16(m,i,n,C,a,c,h,e,D,u,r,a,t,i,o,n);
 static const XMLCh refreshDelayFactor[] =   UNICODE_LITERAL_18(r,e,f,r,e,s,h,D,e,l,a,y,F,a,c,t,o,r);
@@ -58,33 +63,14 @@ namespace opensaml {
 };
 
 DynamicMetadataProvider::DynamicMetadataProvider(const DOMElement* e)
-    : AbstractMetadataProvider(e), m_maxCacheDuration(28800), m_lock(RWLock::create()), m_refreshDelayFactor(0.75), m_minCacheDuration(600)
+    : AbstractMetadataProvider(e),
+      m_validate(XMLHelper::getAttrBool(e, false, validate)),
+        m_id(XMLHelper::getAttrString(e, "Dynamic", id)),
+        m_lock(RWLock::create()),
+        m_refreshDelayFactor(0.75),
+        m_minCacheDuration(XMLHelper::getAttrInt(e, 600, minCacheDuration)),
+        m_maxCacheDuration(XMLHelper::getAttrInt(e, 28800, maxCacheDuration))
 {
-    const XMLCh* flag=e ? e->getAttributeNS(nullptr, validate) : nullptr;
-    m_validate=(XMLString::equals(flag,xmlconstants::XML_TRUE) || XMLString::equals(flag,xmlconstants::XML_ONE));
-
-    flag = e ? e->getAttributeNS(nullptr, minCacheDuration) : nullptr;
-    if (flag && *flag) {
-        m_minCacheDuration = XMLString::parseInt(flag);
-        if (m_minCacheDuration == 0) {
-            Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
-                "invalid minCacheDuration setting, using default"
-                );
-            m_minCacheDuration = 600;
-        }
-    }
-
-    flag = e ? e->getAttributeNS(nullptr, maxCacheDuration) : nullptr;
-    if (flag && *flag) {
-        m_maxCacheDuration = XMLString::parseInt(flag);
-        if (m_maxCacheDuration == 0) {
-            Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
-                "invalid maxCacheDuration setting, using default"
-                );
-            m_maxCacheDuration = 28800;
-        }
-    }
-
     if (m_minCacheDuration > m_maxCacheDuration) {
         Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
             "minCacheDuration setting exceeds maxCacheDuration setting, lowering to match it"
@@ -92,10 +78,10 @@ DynamicMetadataProvider::DynamicMetadataProvider(const DOMElement* e)
         m_minCacheDuration = m_maxCacheDuration;
     }
 
-    flag = e ? e->getAttributeNS(nullptr, refreshDelayFactor) : NULL;
-    if (flag && *flag) {
-        auto_ptr_char delay(flag);
-        m_refreshDelayFactor = atof(delay.get());
+    const XMLCh* delay = e ? e->getAttributeNS(nullptr, refreshDelayFactor) : nullptr;
+    if (delay && *delay) {
+        auto_ptr_char temp(delay);
+        m_refreshDelayFactor = atof(temp.get());
         if (m_refreshDelayFactor <= 0.0 || m_refreshDelayFactor >= 1.0) {
             Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
                 "invalid refreshDelayFactor setting, using default"
@@ -109,7 +95,6 @@ DynamicMetadataProvider::~DynamicMetadataProvider()
 {
     // Each entity in the map is unique (no multimap semantics), so this is safe.
     clearDescriptorIndex(true);
-    delete m_lock;
 }
 
 const XMLObject* DynamicMetadataProvider::getMetadata() const
@@ -132,6 +117,11 @@ void DynamicMetadataProvider::init()
 {
 }
 
+const char* DynamicMetadataProvider::getId() const
+{
+    return m_id.c_str();
+}
+
 pair<const EntityDescriptor*,const RoleDescriptor*> DynamicMetadataProvider::getEntityDescriptor(const Criteria& criteria) const
 {
     Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic");
@@ -251,6 +241,8 @@ pair<const EntityDescriptor*,const RoleDescriptor*> DynamicMetadataProvider::get
         cacheExp = SAMLTIME_MAX;
         indexEntity(entity2.release(), cacheExp, true);
 
+        m_lastUpdate = now;
+
         // Downgrade back to a read lock.
         m_lock->unlock();
         m_lock->rdlock();