X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=f5082b8f0f43665414ee2dd39f58a53b9cae4360;hp=547526d25d5531e5c9c38e502b3ab2f81d7c080c;hb=c9e0e2dc2e15d2004333db7f135947db13956b5e;hpb=2fbc97e0dd6b51eed1e9b07c90e4317bd74e2e34

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 547526d..f5082b8 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -1,5 +1,6 @@
+
 /*
- *  Copyright 2001-2006 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.
@@ -20,32 +21,73 @@
  * Library configuration 
  */
 
-#define SAML_DECLARE_VALIDATORS
-
 #include "internal.h"
+
+#if defined(XMLTOOLING_LOG4SHIB)
+# ifndef OPENSAML_LOG4SHIB
+#  error "Logging library mismatch (XMLTooling is using log4shib)."
+# endif
+#elif defined(XMLTOOLING_LOG4CPP)
+# ifndef OPENSAML_LOG4CPP
+#  error "Logging library mismatch (XMLTooling is using log4cpp)."
+# endif
+#else
+# error "No supported logging library."
+#endif
+
 #include "exceptions.h"
 #include "SAMLConfig.h"
+#include "binding/ArtifactMap.h"
+#include "binding/MessageDecoder.h"
+#include "binding/MessageEncoder.h"
+#include "binding/SAMLArtifact.h"
+#include "binding/SecurityPolicyRule.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
+#include "saml2/metadata/MetadataFilter.h"
+#include "saml2/metadata/MetadataProvider.h"
 #include "util/SAMLConstants.h"
 
+#include <xmltooling/logging.h>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/PathResolver.h>
 
-#include <log4cpp/Category.hh>
 #include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/enc/XSECCryptoProvider.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
 
 using namespace opensaml;
 using namespace xmlsignature;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
-//DECL_EXCEPTION_FACTORY(XMLParserException,xmltooling);
+// Expose entry points when used as an extension library
+
+extern "C" int SAML_API xmltooling_extension_init(void*)
+{
+    if (SAMLConfig::getConfig().init(false))
+        return 0;
+    return -1;
+}
+
+extern "C" void SAML_API xmltooling_extension_term()
+{
+    SAMLConfig::getConfig().term(false);
+}
+
+DECL_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataException,opensaml::saml2md);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml);
 
 namespace opensaml {
    SAMLInternalConfig g_config;
@@ -61,7 +103,13 @@ SAMLInternalConfig& SAMLInternalConfig::getInternalConfig()
     return g_config;
 }
 
-bool SAMLInternalConfig::init()
+void SAMLConfig::setArtifactMap(ArtifactMap* artifactMap)
+{
+    delete m_artifactMap;
+    m_artifactMap = artifactMap;
+}
+
+bool SAMLInternalConfig::init(bool initXMLTooling)
 {
 #ifdef _DEBUG
     xmltooling::NDC ndc("init");
@@ -69,8 +117,18 @@ bool SAMLInternalConfig::init()
     Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig");
     log.debug("library initialization started");
 
-    XMLToolingConfig::getConfig().init();
-    log.debug("XMLTooling library initialized");
+    if (initXMLTooling)
+        XMLToolingConfig::getConfig().init();
+    XMLToolingConfig::getConfig().getPathResolver()->setDefaultPackageName("opensaml");
+
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataException,opensaml::saml2md);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(MetadataFilterException,opensaml::saml2md);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(BindingException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ProfileException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(FatalProfileException,opensaml);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(RetryableProfileException,opensaml);
 
     saml1::registerAssertionClasses();
     saml1p::registerProtocolClasses();
@@ -78,24 +136,37 @@ bool SAMLInternalConfig::init()
     saml2p::registerProtocolClasses();
     saml2md::registerMetadataClasses();
     saml2md::registerMetadataProviders();
+    saml2md::registerMetadataFilters();
+    registerSAMLArtifacts();
+    registerMessageEncoders();
+    registerMessageDecoders();
+    registerSecurityPolicyRules();
 
-    log.info("library initialization complete");
+    log.info("%s library initialization complete", PACKAGE_STRING);
     return true;
 }
 
-void SAMLInternalConfig::term()
+void SAMLInternalConfig::term(bool termXMLTooling)
 {
 #ifdef _DEBUG
     xmltooling::NDC ndc("term");
 #endif
+    Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig");
 
-    saml1::AssertionSchemaValidators.destroyValidators();
-    saml1p::ProtocolSchemaValidators.destroyValidators();
-    saml2::AssertionSchemaValidators.destroyValidators();
-    saml2md::MetadataSchemaValidators.destroyValidators();
+    MessageDecoderManager.deregisterFactories();
+    MessageEncoderManager.deregisterFactories();
+    SecurityPolicyRuleManager.deregisterFactories();
+    SAMLArtifactManager.deregisterFactories();
+    MetadataFilterManager.deregisterFactories();
+    MetadataProviderManager.deregisterFactories();
 
-    XMLToolingConfig::getConfig().term();
-    Category::getInstance(SAML_LOGCAT".SAMLConfig").info("library shutdown complete");
+    delete m_artifactMap;
+    m_artifactMap = NULL;
+
+    if (termXMLTooling)
+        XMLToolingConfig::getConfig().term();
+    
+    log.info("%s library shutdown complete", PACKAGE_STRING);
 }
 
 void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len)
@@ -130,3 +201,106 @@ XMLCh* SAMLInternalConfig::generateIdentifier()
     hexform[33]=0;
     return XMLString::transcode(hexform);
 }
+
+string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
+{
+    static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    auto_ptr<XSECCryptoHash> hasher(XSECPlatformUtils::g_cryptoProvider->hashSHA1());
+    if (hasher.get()) {
+        unsigned char buf[21];
+        hasher->hash(reinterpret_cast<unsigned char*>(const_cast<char*>(s)),strlen(s));
+        if (hasher->finish(buf,20)==20) {
+            string ret;
+            if (toHex) {
+                for (unsigned int i=0; i<20; i++) {
+                    ret+=(DIGITS[((unsigned char)(0xF0 & buf[i])) >> 4 ]);
+                    ret+=(DIGITS[0x0F & buf[i]]);
+                }
+            }
+            else {
+                for (unsigned int i=0; i<20; i++) {
+                    ret+=buf[i];
+                }
+            }
+            return ret;
+        }
+    }
+    throw XMLSecurityException("Unable to generate SHA-1 hash.");
+}
+
+using namespace saml2p;
+using namespace saml2md;
+
+void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, const Status* status, bool rethrow)
+{
+    const RoleDescriptor* role = NULL;
+    if (entity) {
+        const list<XMLObject*>& roles=entity->getOrderedChildren();
+        for (list<XMLObject*>::const_iterator child=roles.begin(); !role && child!=roles.end(); ++child) {
+            role=dynamic_cast<RoleDescriptor*>(*child);
+            if (role && !role->isValid())
+                role = NULL;
+        }
+    }
+    annotateException(e, role, status, rethrow);
+}
+
+void opensaml::annotateException(XMLToolingException* e, const RoleDescriptor* role, const Status* status, bool rethrow)
+{
+    if (role) {
+        auto_ptr_char id(dynamic_cast<EntityDescriptor*>(role->getParent())->getEntityID());
+        e->addProperty("entityID",id.get());
+
+        const vector<ContactPerson*>& contacts=role->getContactPersons();
+        for (vector<ContactPerson*>::const_iterator c=contacts.begin(); c!=contacts.end(); ++c) {
+            const XMLCh* ctype=(*c)->getContactType();
+            if (ctype && (XMLString::equals(ctype,ContactPerson::CONTACT_SUPPORT)
+                    || XMLString::equals(ctype,ContactPerson::CONTACT_TECHNICAL))) {
+                GivenName* fname=(*c)->getGivenName();
+                SurName* lname=(*c)->getSurName();
+                auto_ptr_char first(fname ? fname->getName() : NULL);
+                auto_ptr_char last(lname ? lname->getName() : NULL);
+                if (first.get() && last.get()) {
+                    string contact=string(first.get()) + ' ' + last.get();
+                    e->addProperty("contactName",contact.c_str());
+                }
+                else if (first.get())
+                    e->addProperty("contactName",first.get());
+                else if (last.get())
+                    e->addProperty("contactName",last.get());
+                const vector<EmailAddress*>& emails=const_cast<const ContactPerson*>(*c)->getEmailAddresss();
+                if (!emails.empty()) {
+                    auto_ptr_char email(emails.front()->getAddress());
+                    if (email.get())
+                        e->addProperty("contactEmail",email.get());
+                }
+                break;
+            }
+        }
+
+        auto_ptr_char eurl(role->getErrorURL());
+        if (eurl.get()) {
+            e->addProperty("errorURL",eurl.get());
+        }
+    }
+    
+    if (status) {
+        auto_ptr_char sc(status->getStatusCode() ? status->getStatusCode()->getValue() : NULL);
+        if (sc.get() && *sc.get())
+            e->addProperty("statusCode", sc.get());
+        if (status->getStatusCode()->getStatusCode()) {
+            auto_ptr_char sc2(status->getStatusCode()->getStatusCode()->getValue());
+            if (sc2.get() && *sc.get())
+                e->addProperty("statusCode2", sc2.get());
+        }
+        if (status->getStatusMessage()) {
+            auto_ptr_char msg(status->getStatusMessage()->getMessage());
+            if (msg.get() && *msg.get())
+                e->addProperty("statusMessage", msg.get());
+        }
+    }
+    
+    if (rethrow)
+        e->raise();
+}