Attribute lookup, port ACL code and mainline SP code to Session/Attribute API.

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

diff --git a/shib/Metadata.cpp b/shib/Metadata.cpp
index 314e744..92ddefa 100644 (file)
--- a/shib/Metadata.cpp
+++ b/shib/Metadata.cpp
@@ -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.
@@ -23,127 +23,13 @@
 */
 
 #include "internal.h"
+#include <xmltooling/util/NDC.h>
 
 using namespace shibboleth;
+using namespace opensaml::saml2md;
 using namespace saml;
 using namespace std;
 
-const IEntityDescriptor* Metadata::lookup(const XMLCh* id, bool strict)
-{
-    if (m_mapper) {
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    const IEntityDescriptor* ret=NULL;
-    m_metadatas.reset();
-    while (m_metadatas.hasNext()) {
-        m_mapper=m_metadatas.next();
-        m_mapper->lock();
-        if (ret=m_mapper->lookup(id,strict)) {
-            return ret;
-        }
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    return NULL;
-}
-
-const IEntityDescriptor* Metadata::lookup(const char* id, bool strict)
-{
-    if (m_mapper) {
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    const IEntityDescriptor* ret=NULL;
-    m_metadatas.reset();
-    while (m_metadatas.hasNext()) {
-        m_mapper=m_metadatas.next();
-        m_mapper->lock();
-        if (ret=m_mapper->lookup(id,strict)) {
-            return ret;
-        }
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    return NULL;
-}
-
-const IEntityDescriptor* Metadata::lookup(const SAMLArtifact* artifact)
-{
-    if (m_mapper) {
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    const IEntityDescriptor* ret=NULL;
-    m_metadatas.reset();
-    while (m_metadatas.hasNext()) {
-        m_mapper=m_metadatas.next();
-        m_mapper->lock();
-        if (ret=m_mapper->lookup(artifact)) {
-            return ret;
-        }
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    return NULL;
-}
-
-Metadata::~Metadata()
-{
-    if (m_mapper) {
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-}
-
-bool Trust::validate(const SAMLSignedObject& token, const IRoleDescriptor* role) const
-{
-    m_trusts.reset();
-    while (m_trusts.hasNext()) {
-        if (m_trusts.next()->validate(token,role))
-            return true;
-    }
-    return false;
-}
-
-bool Trust::validate(void* certEE, const Iterator<void*>& certChain, const IRoleDescriptor* role, bool checkName) const
-{
-    m_trusts.reset();
-    while (m_trusts.hasNext()) {
-        if (m_trusts.next()->validate(certEE,certChain,role,checkName))
-            return true;
-    }
-    return false;
-}
-
-const ICredResolver* Credentials::lookup(const char* id)
-{
-    if (m_mapper) {
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    const ICredResolver* ret=NULL;
-    m_creds.reset();
-    while (m_creds.hasNext()) {
-        m_mapper=m_creds.next();
-        m_mapper->lock();
-        if (ret=m_mapper->lookup(id)) {
-            return ret;
-        }
-        m_mapper->unlock();
-        m_mapper=NULL;
-    }
-    return NULL;
-}
-
-Credentials::~Credentials()
-{
-    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();
@@ -180,10 +66,10 @@ AAP::~AAP()
     }
 }
 
-void AAP::apply(const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertion, const IEntityDescriptor* source)
+void AAP::apply(const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertion, const RoleDescriptor* role)
 {
 #ifdef _DEBUG
-    saml::NDC("apply");
+    xmltooling::NDC("apply");
 #endif
     log4cpp::Category& log=log4cpp::Category::getInstance(SHIB_LOGCAT".AAP");
     
@@ -195,7 +81,7 @@ void AAP::apply(const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertio
     aaps.reset();
     while (aaps.hasNext()) {
         IAAP* p=aaps.next();
-        Locker locker(p);
+        xmltooling::Locker locker(p);
         if (p->anyAttribute()) {
             log.info("any attribute enabled, accepting entire assertion");
             return;
@@ -220,11 +106,11 @@ void AAP::apply(const saml::Iterator<IAAP*>& aaps, saml::SAMLAssertion& assertio
             aaps.reset();
             while (aaps.hasNext()) {
                 IAAP* i=aaps.next();
-                Locker locker(i);
+                xmltooling::Locker locker(i);
                 if (rule=i->lookup(a->getName(),a->getNamespace())) {
                     ruleFound=true;
                     try {
-                        rule->apply(*a,source);
+                        rule->apply(*a,role);
                     }
                     catch (SAMLException&) {
                         // The attribute is now defunct.