Safer locking code.

diff --git a/shib/Metadata.cpp b/shib/Metadata.cpp
index 4dd7b3e..767a70b 100644 (file)
--- a/shib/Metadata.cpp
+++ b/shib/Metadata.cpp
@@ -1,50 +1,17 @@
-/* 
- * The Shibboleth License, Version 1. 
- * Copyright (c) 2002 
- * University Corporation for Advanced Internet Development, Inc. 
- * All rights reserved
- * 
- * 
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this 
- * list of conditions and the following disclaimer.
- * 
- * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution, if any, must include 
- * the following acknowledgment: "This product includes software developed by 
- * the University Corporation for Advanced Internet Development 
- * <http://www.ucaid.edu>Internet2 Project. Alternately, this acknowledegement 
- * may appear in the software itself, if and wherever such third-party 
- * acknowledgments normally appear.
- * 
- * Neither the name of Shibboleth nor the names of its contributors, nor 
- * Internet2, nor the University Corporation for Advanced Internet Development, 
- * Inc., nor UCAID may be used to endorse or promote products derived from this 
- * software without specific prior written permission. For written permission, 
- * please contact shibboleth@shibboleth.org
- * 
- * Products derived from this software may not be called Shibboleth, Internet2, 
- * UCAID, or the University Corporation for Advanced Internet Development, nor 
- * may Shibboleth appear in their name, without prior written permission of the 
- * University Corporation for Advanced Internet Development.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED AND THE ENTIRE RISK 
- * OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS WITH LICENSEE. 
- * IN NO EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY 
- * CORPORATION FOR ADVANCED INTERNET DEVELOPMENT, INC. BE LIABLE FOR ANY DIRECT, 
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+ *  Copyright 2001-2005 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
+ *
+ *     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.
  */
 
 /* Metadata.h - glue classes that interface to metadata providers
@@ -70,13 +37,13 @@ const IEntityDescriptor* Metadata::lookup(const XMLCh* id, bool strict)
     const IEntityDescriptor* ret=NULL;
     m_metadatas.reset();
     while (m_metadatas.hasNext()) {
-        IMetadata* i=m_metadatas.next();
-        i->lock();
-        if (ret=i->lookup(id,strict)) {
-            m_mapper=i;
+        m_mapper=m_metadatas.next();
+        m_mapper->lock();
+        if (ret=m_mapper->lookup(id,strict)) {
             return ret;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
     return NULL;
 }
@@ -90,13 +57,13 @@ const IEntityDescriptor* Metadata::lookup(const char* id, bool strict)
     const IEntityDescriptor* ret=NULL;
     m_metadatas.reset();
     while (m_metadatas.hasNext()) {
-        IMetadata* i=m_metadatas.next();
-        i->lock();
-        if (ret=i->lookup(id,strict)) {
-            m_mapper=i;
+        m_mapper=m_metadatas.next();
+        m_mapper->lock();
+        if (ret=m_mapper->lookup(id,strict)) {
             return ret;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
     return NULL;
 }
@@ -110,21 +77,23 @@ const IEntityDescriptor* Metadata::lookup(const SAMLArtifact* artifact)
     const IEntityDescriptor* ret=NULL;
     m_metadatas.reset();
     while (m_metadatas.hasNext()) {
-        IMetadata* i=m_metadatas.next();
-        i->lock();
-        if (ret=i->lookup(artifact)) {
-            m_mapper=i;
+        m_mapper=m_metadatas.next();
+        m_mapper->lock();
+        if (ret=m_mapper->lookup(artifact)) {
             return ret;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
     return NULL;
 }
 
 Metadata::~Metadata()
 {
-    if (m_mapper)
+    if (m_mapper) {
         m_mapper->unlock();
+        m_mapper=NULL;
+    }
 }
 
 bool Trust::validate(const SAMLSignedObject& token, const IRoleDescriptor* role) const
@@ -156,34 +125,36 @@ const ICredResolver* Credentials::lookup(const char* id)
     const ICredResolver* ret=NULL;
     m_creds.reset();
     while (m_creds.hasNext()) {
-        ICredentials* i=m_creds.next();
-        i->lock();
-        if (ret=i->lookup(id)) {
-            m_mapper=i;
+        m_mapper=m_creds.next();
+        m_mapper->lock();
+        if (ret=m_mapper->lookup(id)) {
             return ret;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
     return NULL;
 }
 
 Credentials::~Credentials()
 {
-    if (m_mapper)
+    if (m_mapper) {
         m_mapper->unlock();
+        m_mapper=NULL;
+    }
 }
 
 AAP::AAP(const saml::Iterator<IAAP*>& aaps, const XMLCh* attrName, const XMLCh* attrNamespace) : m_mapper(NULL), m_rule(NULL)
 {
     aaps.reset();
     while (aaps.hasNext()) {
-        IAAP* i=aaps.next();
-        i->lock();
-        if (m_rule=i->lookup(attrName,attrNamespace)) {
-            m_mapper=i;
+        m_mapper=aaps.next();
+        m_mapper->lock();
+        if (m_rule=m_mapper->lookup(attrName,attrNamespace)) {
             break;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
 }
 
@@ -191,25 +162,29 @@ AAP::AAP(const saml::Iterator<IAAP*>& aaps, const char* alias) : m_mapper(NULL),
 {
     aaps.reset();
     while (aaps.hasNext()) {
-        IAAP* i=aaps.next();
-        i->lock();
-        if (m_rule=i->lookup(alias)) {
-            m_mapper=i;
+        m_mapper=aaps.next();
+        m_mapper->lock();
+        if (m_rule=m_mapper->lookup(alias)) {
             break;
         }
-        i->unlock();
+        m_mapper->unlock();
+        m_mapper=NULL;
     }
 }
 
 AAP::~AAP()
 {
-    if (m_mapper)
+    if (m_mapper) {
         m_mapper->unlock();
+        m_mapper=NULL;
+    }
 }
 
 void AAP::apply(const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertion, const IRoleDescriptor* role)
 {
+#ifdef _DEBUG
     saml::NDC("apply");
+#endif
     log4cpp::Category& log=log4cpp::Category::getInstance(SHIB_LOGCAT".AAP");
     
     // First check for no providers or AnyAttribute.